fix listboard_model to be label_lower str

edc_lab_dashboard/views/listboard_views/aliquot_listboard_view.py

@@ -1,5 +1,3 @@
-from edc_lab.models import Aliquot
-
 from ...model_wrappers import AliquotModelWrapper
 from ..listboard_filters import AliquotListboardViewFilters
 from .base_listboard_view import BaseListboardView
@@ -12,7 +10,7 @@ class AliquotListboardView(BaseListboardView):
     listboard_view_filters = AliquotListboardViewFilters()
     listboard_view_permission_codename = "edc_lab_dashboard.view_lab_aliquot_listboard"
     listboard_view_only_my_permission_codename = None
-    listboard_model = Aliquot
+    listboard_model = "edc_lab.aliquot"
     model_wrapper_cls = AliquotModelWrapper
     navbar_selected_item = "aliquot"
     search_form_url = "aliquot_listboard_url"

edc_lab_dashboard/views/listboard_views/base_box_item_listboard_view.py

@@ -2,8 +2,6 @@
 
 from typing import TYPE_CHECKING
 
-from edc_lab.models import BoxItem
-
 from ...view_mixins import BoxViewMixin
 from .base_listboard_view import BaseListboardView
 
@@ -14,7 +12,7 @@
 class BaseBoxItemListboardView(BoxViewMixin, BaseListboardView):
     navbar_selected_item = "pack"
     ordering = ("-position",)
-    listboard_model = BoxItem
+    listboard_model = "edc_lab.boxitem"
     listboard_view_permission_codename = "edc_lab_dashboard.view_lab_box_listboard"
 
     def get_queryset_filter_options(self, request, *args, **kwargs) -> tuple[Q, dict]:

edc_lab_dashboard/views/listboard_views/manage_box_listboard_view.py

@@ -3,7 +3,6 @@
 
 from django.urls.base import reverse
 from edc_dashboard.url_names import url_names
-from edc_lab.models import BoxItem
 
 from ...model_wrappers import ManageBoxItemModelWrapper
 from .base_box_item_listboard_view import BaseBoxItemListboardView
@@ -15,7 +14,7 @@ class ManageBoxListboardView(BaseBoxItemListboardView):
     listboard_url = "manage_box_listboard_url"
     listboard_template = "manage_box_listboard_template"
     verify_box_listboard_url = "verify_box_listboard_url"
-    listboard_model = BoxItem
+    listboard_model = "edc_lab.boxitem"
     model_wrapper_cls = ManageBoxItemModelWrapper
     navbar_selected_item = "pack"
     search_form_url = "manage_box_listboard_url"

edc_lab_dashboard/views/listboard_views/manage_manifest_listboard_view.py

@@ -1,7 +1,6 @@
 from typing import Any
 
 from edc_lab.constants import SHIPPED
-from edc_lab.models import ManifestItem
 
 from ...model_wrappers import ManifestItemModelWrapper
 from ...view_mixins import ManifestViewMixin
@@ -17,7 +16,7 @@ class ManageManifestListboardView(ManifestViewMixin, BaseListboardView):
     listboard_view_permission_codename = "edc_lab_dashboard.view_lab_manifest_listboard"
     search_form_url = "manage_manifest_listboard_url"
 
-    listboard_model = ManifestItem
+    listboard_model = "edc_lab.manifestitem"
     model_wrapper_cls = ManifestItemModelWrapper
 
     def get_context_data(self, **kwargs) -> dict[str, Any]:

edc_lab_dashboard/views/listboard_views/manifest_listboard_view.py

@@ -2,7 +2,6 @@
 
 from edc_dashboard.url_names import url_names
 from edc_lab.constants import SHIPPED
-from edc_lab.models import Manifest
 from edc_lab.pdf_reports import ManifestPdfReport
 
 from ...model_wrappers import ManifestModelWrapper
@@ -16,7 +15,7 @@ class ManifestListboardView(BaseListboardView):
     form_action_url = "manifest_form_action_url"
     listboard_url = "manifest_listboard_url"
     listboard_template = "manifest_listboard_template"
-    listboard_model = Manifest
+    listboard_model = "edc_lab.manifest"
     listboard_view_permission_codename = "edc_lab_dashboard.view_lab_manifest_listboard"
     listboard_view_only_my_permission_codename = None
     model_wrapper_cls = ManifestModelWrapper
@@ -26,7 +25,7 @@ class ManifestListboardView(BaseListboardView):
 
     def get_context_data(self, **kwargs) -> dict[str, Any]:
         kwargs.update(
-            new_manifest=ManifestModelWrapper(Manifest()),
+            new_manifest=ManifestModelWrapper(self.listboard_model_cls()),
             print_manifest_url_name=url_names.get(self.print_manifest_url),
             SHIPPED=SHIPPED,
         )
@@ -40,7 +39,9 @@ def get(self, request, *args, **kwargs):
 
     @property
     def manifest(self):
-        return Manifest.objects.get(manifest_identifier=self.request.GET.get("pdf"))
+        return self.listboard_model_cls.objects.get(
+            manifest_identifier=self.request.GET.get("pdf")
+        )
 
     def print_manifest(self):
         manifest_report = ManifestPdfReport(manifest=self.manifest, user=self.request.user)

edc_lab_dashboard/views/listboard_views/pack_listboard_view.py

@@ -3,7 +3,7 @@
 from django.apps import apps as django_apps
 from edc_constants.constants import OPEN
 from edc_lab.constants import SHIPPED
-from edc_lab.models import Box, Manifest
+from edc_lab.models import Manifest
 
 from ...model_wrappers import BoxModelWrapper
 from ..listboard_filters import PackListboardViewFilters
@@ -17,7 +17,7 @@ class PackListboardView(BaseListboardView):
     form_action_url = "pack_form_action_url"
     listboard_url = "pack_listboard_url"
     listboard_template = "pack_listboard_template"
-    listboard_model = Box
+    listboard_model = "edc_lab.box"
     listboard_view_permission_codename = "edc_lab_dashboard.view_lab_pack_listboard"
     listboard_view_only_my_permission_codename = None
     model_wrapper_cls = BoxModelWrapper
@@ -31,7 +31,7 @@ def open_manifests(self):
 
     def get_context_data(self, **kwargs) -> dict[str, Any]:
         kwargs.update(
-            new_box=BoxModelWrapper(Box()),
+            new_box=BoxModelWrapper(self.listboard_model_cls()),
             open_manifests=self.open_manifests,
             SHIPPED=SHIPPED,
         )

edc_lab_dashboard/views/listboard_views/requisition_listboard_view.py

@@ -1,19 +1,17 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any
+from typing import Any
 
 from django.conf import settings
 from django.contrib import messages
+from django.db.models import Q
 from django.utils.html import format_html
 from edc_constants.constants import YES
 
 from ...model_wrappers import RequisitionModelWrapper
 from ..listboard_filters import RequisitionListboardViewFilters
 from .base_listboard_view import BaseListboardView
 
-if TYPE_CHECKING:
-    from django.db.models import Q
-
 
 class RequisitionListboardView(BaseListboardView):
     listboard_model = settings.SUBJECT_REQUISITION_MODEL

edc_lab_dashboard/views/listboard_views/result_listboard_view.py

@@ -1,5 +1,3 @@
-from edc_lab.models import Result
-
 from ...model_wrappers import ResultModelWrapper
 from .base_listboard_view import BaseListboardView
 
@@ -8,7 +6,7 @@ class ResultListboardView(BaseListboardView):
     form_action_url = "aliquot_form_action_url"
     listboard_template = "result_listboard_template"
     listboard_url = "result_listboard_url"
-    listboard_model = Result
+    listboard_model = "edc_lab.result"
     listboard_view_permission_codename = "edc_lab_dashboard.view_lab_result_listboard"
     listboard_view_only_my_permission_codename = None
     model_wrapper_cls = ResultModelWrapper