Merge branch 'release/0.1.8' into main

edc_pharmacy_dashboard/model_wrappers/__init__.py

@@ -1 +0,0 @@
-from .prescription_model_wrapper import PrescriptionModelWrapper

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",

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

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

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
 

runtests.py

@@ -2,22 +2,63 @@
 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"
 base_dir = Path(__file__).absolute().parent
 
 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