revise stock models, WIP ...

edc_pharmacy/admin/__init__.py

@@ -1,21 +1,19 @@
 from .autocomplete_admin import SubjectAdmin
 from .dispensing_history_admin import DispensingHistoryAdmin
-from .dosage_guideline_admin import DosageGuidelineAdmin
-from .formulation_admin import FormulationAdmin
-from .labels_admin import LabelsAdmin
-from .list_model_admin import (
+from .medication import (
+    AssignmentAdmin,
+    ContainerTypeAdmin,
+    DosageGuidelineAdmin,
+    FormulationAdmin,
     FormulationTypeAdmin,
     FrequencyUnitsAdmin,
+    LotAdmin,
+    MedicationAdmin,
     RouteAdmin,
     UnitsAdmin,
 )
-from .medication_admin import MedicationAdmin
-from .medication_lot_admin import MedicationLotAdmin
 from .order_admin import OrderAdmin
-from .product_admin import ProductAdmin
+from .prescription import RxAdmin, RxRefillAdmin
 from .return_history_admin import ReturnHistoryAdmin
-from .rx_admin import RxAdmin
-from .rx_refill_admin import RxRefillAdmin
-from .stock_admin import StockAdmin
-from .stock_create_labels_admin import StockCreateLabelsAdmin
-from .stock_receiving_admin import StockReceivingAdmin
+
+# from .stock import ProductAdmin, ReceivingAdmin, StockAdmin

edc_pharmacy/admin/medication/__init__.py

@@ -0,0 +1,10 @@
+from .assignment_admin import AssignmentAdmin
+from .container_type_admin import ContainerTypeAdmin
+from .dosage_guideline_admin import DosageGuidelineAdmin
+from .formulation_admin import FormulationAdmin
+from .formulation_type_admin import FormulationTypeAdmin
+from .frequency_units_admin import FrequencyUnitsAdmin
+from .lot_admin import LotAdmin
+from .medication_admin import MedicationAdmin
+from .route_admin import RouteAdmin
+from .units_admin import UnitsAdmin

edc_pharmacy/admin/medication/assignment_admin.py

@@ -0,0 +1,39 @@
+from typing import Tuple
+
+from django import forms
+from django.contrib import admin
+from django_audit_fields.admin import audit_fieldset_tuple
+
+from ...admin_site import edc_pharmacy_admin
+from ...models import Assignment
+from ..model_admin_mixin import ModelAdminMixin
+
+
+class AssignmentForm(forms.ModelForm):
+    class Meta:
+        model = Assignment
+        fields = "__all__"
+
+
+@admin.register(Assignment, site=edc_pharmacy_admin)
+class AssignmentAdmin(ModelAdminMixin, admin.ModelAdmin):
+    show_object_tools = True
+
+    form = AssignmentForm
+
+    fieldsets = (
+        (
+            None,
+            {"fields": ["assignment", "display_label"]},
+        ),
+        audit_fieldset_tuple,
+    )
+
+    list_display: Tuple[str, ...] = (
+        "assignment",
+        "display_label",
+        "created",
+        "modified",
+    )
+
+    search_fields: Tuple[str, ...] = ("assignment", "display_label")

edc_pharmacy/admin/medication/container_type_admin.py

@@ -0,0 +1,10 @@
+from django.contrib import admin
+from edc_list_data.admin import ListModelAdminMixin
+
+from ...admin_site import edc_pharmacy_admin
+from ...models import ContainerType
+
+
+@admin.register(ContainerType, site=edc_pharmacy_admin)
+class ContainerTypeAdmin(ListModelAdminMixin, admin.ModelAdmin):
+    pass

edc_pharmacy/admin/dosage_guideline_admin.py → edc_pharmacy/admin/medication/dosage_guideline_admin.py

@@ -3,10 +3,10 @@
 from django.contrib import admin
 from django_audit_fields.admin import audit_fieldset_tuple
 
-from ..admin_site import edc_pharmacy_admin
-from ..forms import DosageGuidelineForm
-from ..models import DosageGuideline
-from .model_admin_mixin import ModelAdminMixin
+from ...admin_site import edc_pharmacy_admin
+from ...forms import DosageGuidelineForm
+from ...models import DosageGuideline
+from ..model_admin_mixin import ModelAdminMixin
 
 
 @admin.register(DosageGuideline, site=edc_pharmacy_admin)

edc_pharmacy/admin/formulation_admin.py → edc_pharmacy/admin/medication/formulation_admin.py

@@ -3,10 +3,10 @@
 from django.contrib import admin
 from django_audit_fields.admin import audit_fieldset_tuple
 
-from ..admin_site import edc_pharmacy_admin
-from ..forms import FormulationForm
-from ..models import Formulation
-from .model_admin_mixin import ModelAdminMixin
+from ...admin_site import edc_pharmacy_admin
+from ...forms import FormulationForm
+from ...models import Formulation
+from ..model_admin_mixin import ModelAdminMixin
 
 
 @admin.register(Formulation, site=edc_pharmacy_admin)

edc_pharmacy/admin/medication/formulation_type_admin.py

@@ -0,0 +1,10 @@
+from django.contrib import admin
+from edc_list_data.admin import ListModelAdminMixin
+
+from ...admin_site import edc_pharmacy_admin
+from ...models import FormulationType
+
+
+@admin.register(FormulationType, site=edc_pharmacy_admin)
+class FormulationTypeAdmin(ListModelAdminMixin, admin.ModelAdmin):
+    pass

edc_pharmacy/admin/medication/frequency_units_admin.py

@@ -0,0 +1,10 @@
+from django.contrib import admin
+from edc_list_data.admin import ListModelAdminMixin
+
+from ...admin_site import edc_pharmacy_admin
+from ...models import FrequencyUnits
+
+
+@admin.register(FrequencyUnits, site=edc_pharmacy_admin)
+class FrequencyUnitsAdmin(ListModelAdminMixin, admin.ModelAdmin):
+    pass

edc_pharmacy/admin/medication_lot_admin.py → edc_pharmacy/admin/medication/lot_admin.py

@@ -3,17 +3,17 @@
 from django.contrib import admin
 from django_audit_fields.admin import audit_fieldset_tuple
 
-from ..admin_site import edc_pharmacy_admin
-from ..forms import MedicationLotForm
-from ..models import MedicationLot
-from .model_admin_mixin import ModelAdminMixin
+from ...admin_site import edc_pharmacy_admin
+from ...forms import LotForm
+from ...models import Lot
+from ..model_admin_mixin import ModelAdminMixin
 
 
-@admin.register(MedicationLot, site=edc_pharmacy_admin)
-class MedicationLotAdmin(ModelAdminMixin, admin.ModelAdmin):
+@admin.register(Lot, site=edc_pharmacy_admin)
+class LotAdmin(ModelAdminMixin, admin.ModelAdmin):
     show_object_tools = True
 
-    form = MedicationLotForm
+    form = LotForm
 
     fieldsets = (
         (
@@ -23,6 +23,7 @@ class MedicationLotAdmin(ModelAdminMixin, admin.ModelAdmin):
                     "lot_no",
                     "expiration_date",
                     "formulation",
+                    "assignment",
                 ]
             },
         ),
@@ -33,6 +34,7 @@ class MedicationLotAdmin(ModelAdminMixin, admin.ModelAdmin):
         "lot_no",
         "expiration_date",
         "formulation",
+        "assignment",
         "created",
         "modified",
     )
@@ -41,9 +43,11 @@ class MedicationLotAdmin(ModelAdminMixin, admin.ModelAdmin):
         "lot_no",
         "expiration_date",
         "formulation",
+        "assignment",
         "created",
         "modified",
     )
+    radio_fields: Tuple[str, ...] = {"assignment": admin.VERTICAL}
 
     search_fields: Tuple[str, ...] = ("lot_no",)
 

edc_pharmacy/admin/medication_admin.py → edc_pharmacy/admin/medication/medication_admin.py

@@ -3,10 +3,10 @@
 from django.contrib import admin
 from django_audit_fields.admin import audit_fieldset_tuple
 
-from ..admin_site import edc_pharmacy_admin
-from ..forms import MedicationForm
-from ..models import Medication
-from .model_admin_mixin import ModelAdminMixin
+from ...admin_site import edc_pharmacy_admin
+from ...forms import MedicationForm
+from ...models import Medication
+from ..model_admin_mixin import ModelAdminMixin
 
 
 @admin.register(Medication, site=edc_pharmacy_admin)

edc_pharmacy/admin/medication/route_admin.py

@@ -0,0 +1,10 @@
+from django.contrib import admin
+from edc_list_data.admin import ListModelAdminMixin
+
+from ...admin_site import edc_pharmacy_admin
+from ...models import Route
+
+
+@admin.register(Route, site=edc_pharmacy_admin)
+class RouteAdmin(ListModelAdminMixin, admin.ModelAdmin):
+    pass

edc_pharmacy/admin/medication/units_admin.py

@@ -0,0 +1,10 @@
+from django.contrib import admin
+from edc_list_data.admin import ListModelAdminMixin
+
+from ...admin_site import edc_pharmacy_admin
+from ...models import Units
+
+
+@admin.register(Units, site=edc_pharmacy_admin)
+class UnitsAdmin(ListModelAdminMixin, admin.ModelAdmin):
+    pass

edc_pharmacy/admin/prescription/__init__.py

@@ -0,0 +1,2 @@
+from .rx_admin import RxAdmin
+from .rx_refill_admin import RxRefillAdmin

edc_pharmacy/admin/rx_admin.py → edc_pharmacy/admin/prescription/rx_admin.py

@@ -4,10 +4,10 @@
 from django_audit_fields.admin import audit_fieldset_tuple
 from edc_model_admin.dashboard import ModelAdminSubjectDashboardMixin
 
-from ..admin_site import edc_pharmacy_admin
-from ..forms import RxForm
-from ..models import Rx
-from .list_filters import MedicationsListFilter
+from ...admin_site import edc_pharmacy_admin
+from ...forms import RxForm
+from ...models import Rx
+from ..list_filters import MedicationsListFilter
 
 
 @admin.register(Rx, site=edc_pharmacy_admin)

edc_pharmacy/admin/rx_refill_admin.py → edc_pharmacy/admin/prescription/rx_refill_admin.py

@@ -10,11 +10,11 @@
 from edc_dashboard.utils import get_bootstrap_version
 from edc_utils import convert_php_dateformat, formatted_age, get_utcnow
 
-from ..admin_site import edc_pharmacy_admin
-from ..forms import RxRefillForm
-from ..models import RxRefill
-from .dispensing_history_admin import DispensingHistoryInlineAdmin
-from .model_admin_mixin import ModelAdminMixin
+from ...admin_site import edc_pharmacy_admin
+from ...forms import RxRefillForm
+from ...models import RxRefill
+from ..dispensing_history_admin import DispensingHistoryInlineAdmin
+from ..model_admin_mixin import ModelAdminMixin
 
 
 @admin.register(RxRefill, site=edc_pharmacy_admin)

edc_pharmacy/admin/stock/__init__.py

@@ -0,0 +1,3 @@
+# from .product_admin import ProductAdmin
+# from .receiving_admin import ReceivingAdmin
+# from .stock_admin import StockAdmin