refactor submissions to object list

rcpch · Jul 30, 2024 · 7b79d29 · 7b79d29
1 parent 7183b5c
commit 7b79d29
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 20 deletions.
diff --git a/project/npda/templates/submissions_list.html b/project/npda/templates/submissions_list.html
@@ -6,7 +6,7 @@
       <div class="inline-block min-w-full py-2 sm:px-6 lg:px-8">
           <div class="relative overflow-x-auto">
           <strong>All Submissions for {{pz_code}}</strong>
-          {% include 'partials/submission_history.html' with submissions=submissions %}
+          {% include 'partials/submission_history.html' with submissions=object_list %}
           </div>
       </div>
     </div>

diff --git a/project/npda/views/patient.py b/project/npda/views/patient.py
@@ -267,7 +267,6 @@ class PatientUpdateView(
     success_url = reverse_lazy("patients")
 
     def get_context_data(self, **kwargs):
-        PaediatricDiabetesUnit = apps.get_model("npda", "PaediatricDiabetesUnit")
         Transfer = apps.get_model("npda", "Transfer")
         patient = Patient.objects.get(pk=self.kwargs["pk"])
 

diff --git a/project/npda/views/submissions.py b/project/npda/views/submissions.py
@@ -32,12 +32,16 @@ def get_queryset(self) -> Iterable[Any]:
 
         :return: The queryset for the view
         """
+        PaediatricDiabetesUnit = apps.get_model(
+            app_label="npda", model_name="PaediatricDiabetesUnit"
+        )
+        pdu, created = PaediatricDiabetesUnit.objects.get_or_create(
+            pz_code=self.request.session.get("pz_code"),
+            ods_code=self.request.session.get("ods_code"),
+        )
         queryset = (
-            self.model.objects.filter(
-                pz_code=self.request.session.get("pz_code"),
-                ods_code=self.request.session.get("ods_code"),
-            )
-            .values("submission_date", "pz_code", "ods_code", "quarter", "audit_year")
+            self.model.objects.filter(paediatric_diabetes_unit=pdu)
+            .values("submission_date", "quarter", "audit_year")
             .annotate(
                 patient_count=Count("patients"),
                 submission_active=F("submission_active"),
@@ -48,8 +52,6 @@ def get_queryset(self) -> Iterable[Any]:
             )
             .order_by(
                 "-submission_date",
-                "pz_code",
-                "ods_code",
                 "audit_year",
                 "quarter",
                 "submission_active",
@@ -68,17 +70,6 @@ def get_context_data(self, **kwargs: Any) -> dict:
         context["pz_code"] = self.request.session.get("pz_code")
         return context
 
-    def get(self, request, *args, **kwargs):
-        """
-        Handle the GET request.
-
-        :param request: The request
-        :param args: The arguments
-        :param kwargs: The keyword arguments
-        :return: The response
-        """
-        return super().get(request, *args, **kwargs)
-
     def post(self, request, *args, **kwargs):
         """
         Handle the POST request.