From 06066cb1fd120876ef142da95582e6d31aaad5f1 Mon Sep 17 00:00:00 2001 From: erikvw Date: Fri, 26 Jan 2024 12:35:14 -0600 Subject: [PATCH 1/3] fix tests --- .../model_wrappers/__init__.py | 1 - .../tests/tests/__init__.py | 0 .../tests/tests/test_dashboard.py | 6 +++ .../views/listboard_views/__init__.py | 3 -- .../prescribe_listboard_view.py | 4 +- runtests.py | 46 ++++++++++++++++++- 6 files changed, 51 insertions(+), 9 deletions(-) create mode 100644 edc_pharmacy_dashboard/tests/tests/__init__.py create mode 100644 edc_pharmacy_dashboard/tests/tests/test_dashboard.py diff --git a/edc_pharmacy_dashboard/model_wrappers/__init__.py b/edc_pharmacy_dashboard/model_wrappers/__init__.py index 7494c65..e69de29 100644 --- a/edc_pharmacy_dashboard/model_wrappers/__init__.py +++ b/edc_pharmacy_dashboard/model_wrappers/__init__.py @@ -1 +0,0 @@ -from .prescription_model_wrapper import PrescriptionModelWrapper diff --git a/edc_pharmacy_dashboard/tests/tests/__init__.py b/edc_pharmacy_dashboard/tests/tests/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/edc_pharmacy_dashboard/tests/tests/test_dashboard.py b/edc_pharmacy_dashboard/tests/tests/test_dashboard.py new file mode 100644 index 0000000..2b139e1 --- /dev/null +++ b/edc_pharmacy_dashboard/tests/tests/test_dashboard.py @@ -0,0 +1,6 @@ +from django.test import TestCase + + +class Tests(TestCase): + def test_ok(self): + pass diff --git a/edc_pharmacy_dashboard/views/listboard_views/__init__.py b/edc_pharmacy_dashboard/views/listboard_views/__init__.py index c322265..3cd068b 100644 --- a/edc_pharmacy_dashboard/views/listboard_views/__init__.py +++ b/edc_pharmacy_dashboard/views/listboard_views/__init__.py @@ -1,4 +1 @@ -# from .appointment_listboard_view import AppointmentListboardView from .prescribe_listboard_view import PrescribeListboardView - -# from .worklist_listboard_view import WorklistListboardView diff --git a/edc_pharmacy_dashboard/views/listboard_views/prescribe_listboard_view.py b/edc_pharmacy_dashboard/views/listboard_views/prescribe_listboard_view.py index f62da64..584f44e 100644 --- a/edc_pharmacy_dashboard/views/listboard_views/prescribe_listboard_view.py +++ b/edc_pharmacy_dashboard/views/listboard_views/prescribe_listboard_view.py @@ -7,7 +7,6 @@ from django.utils.decorators import method_decorator from edc_navbar import NavbarViewMixin -from ...model_wrappers import PrescriptionModelWrapper from ..listboard_filters import PrescriptionListboardViewFilters from .base_listboard import BaseListboardView @@ -25,8 +24,7 @@ class PrescribeListboardView(NavbarViewMixin, BaseListboardView): listboard_url_name = app_config.prescribe_listboard_url_name listboard_view_filters = PrescriptionListboardViewFilters() - model = PrescriptionModelWrapper.model - model_wrapper_cls = PrescriptionModelWrapper + model = "edc_pharmacy.prescription" show_all = True diff --git a/runtests.py b/runtests.py index 280f112..ac12f90 100644 --- a/runtests.py +++ b/runtests.py @@ -10,14 +10,56 @@ project_settings = DefaultTestSettings( calling_file=__file__, - EDC_NAVBAR_VERIFY_ON_LOAD=IGNORE, + SILENCED_SYSTEM_CHECKS=[ + "sites.E101", + "edc_navbar.E002", + "edc_navbar.E003", + "edc_consent.E001", + ], EDC_AUTH_CODENAMES_WARN_ONLY=True, EDC_AUTH_SKIP_SITE_AUTHS=True, EDC_AUTH_SKIP_AUTH_UPDATER=True, + EDC_SITES_REGISTER_DEFAULT=True, BASE_DIR=base_dir, APP_NAME=app_name, SUBJECT_VISIT_MODEL="edc_visit_tracking.subjectvisit", - EXTRA_INSTALLED_APPS=[f"{app_name}.apps.AppConfig"], + INSTALLED_APPS=[ + "django.contrib.admin", + "django.contrib.auth", + "django.contrib.contenttypes", + "django.contrib.sessions", + "django.contrib.messages", + "django.contrib.staticfiles", + "django.contrib.sites", + "django_crypto_fields.apps.AppConfig", + "multisite", + "edc_action_item.apps.AppConfig", + "edc_appointment.apps.AppConfig", + "edc_auth.apps.AppConfig", + "edc_data_manager.apps.AppConfig", + "edc_device.apps.AppConfig", + "edc_dashboard.apps.AppConfig", + "edc_facility.apps.AppConfig", + "edc_form_runners.apps.AppConfig", + "edc_identifier.apps.AppConfig", + "edc_lab.apps.AppConfig", + "edc_label.apps.AppConfig", + "edc_locator.apps.AppConfig", + "edc_metadata.apps.AppConfig", + "edc_notification.apps.AppConfig", + "edc_offstudy.apps.AppConfig", + "edc_randomization.apps.AppConfig", + "edc_registration.apps.AppConfig", + "edc_sites.apps.AppConfig", + "edc_timepoint.apps.AppConfig", + "edc_visit_schedule.apps.AppConfig", + "edc_visit_tracking.apps.AppConfig", + "edc_prn.apps.AppConfig", + "edc_pdf_reports.apps.AppConfig", + "edc_pharmacy.apps.AppConfig", + "edc_pharmacy_dashboard.apps.AppConfig", + "edc_appconfig.apps.AppConfig", + ], add_dashboard_middleware=True, add_lab_dashboard_middleware=True, ).settings From 42d1c7d0b2c42e0f6b9be60e969026d9dc5cae6b Mon Sep 17 00:00:00 2001 From: erikvw Date: Fri, 26 Jan 2024 12:35:24 -0600 Subject: [PATCH 2/3] fix tests --- runtests.py | 1 - 1 file changed, 1 deletion(-) diff --git a/runtests.py b/runtests.py index ac12f90..b31706e 100644 --- a/runtests.py +++ b/runtests.py @@ -2,7 +2,6 @@ import logging from pathlib import Path -from edc_constants.constants import IGNORE from edc_test_utils import DefaultTestSettings, func_main app_name = "edc_pharmacy_dashboard" From 97b34901760b6a617400fa1a2ee78943d88c8ee6 Mon Sep 17 00:00:00 2001 From: erikvw Date: Fri, 26 Jan 2024 23:39:59 -0600 Subject: [PATCH 3/3] rename navbar append_item method to register --- edc_pharmacy_dashboard/navbars.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/edc_pharmacy_dashboard/navbars.py b/edc_pharmacy_dashboard/navbars.py index 99b0268..1b0659f 100644 --- a/edc_pharmacy_dashboard/navbars.py +++ b/edc_pharmacy_dashboard/navbars.py @@ -6,31 +6,31 @@ navbar = Navbar(name="pharmacy_dashboard") -navbar.append_item( +navbar.register( NavbarItem( name="prescribe", title="prescribe", label="Prescribe", - glyphicon="glyphicon-edit", + fa_icon="fa-pencil", no_url_namespace=no_url_namespace, codename="edc_navbar.nav_pharmacy_prescribe", url_name="edc_pharmacy_dashboard:prescribe_listboard_url", ) ) -navbar.append_item( +navbar.register( NavbarItem( name="dispense", title="dispense", label="Dispense", - glyphicon="glyphicon-share", + fa_icon="fa-notes-medical", no_url_namespace=no_url_namespace, codename="edc_navbar.nav_pharmacy_dispense", url_name="edc_pharmacy_dashboard:dispense_listboard_url", ) ) -navbar.append_item( +navbar.register( NavbarItem( name="pharmacy", fa_icon="fa-medkit",