From b77b83f79a02e7da34ea34e63b5823298bcaf916 Mon Sep 17 00:00:00 2001
From: Michael Barton <michael@mbarton.cc>
Date: Sat, 11 Jan 2025 20:31:47 +0000
Subject: [PATCH 1/3] Remove filters that duplicate the nav bar context menu

---
 .../templates/partials/patient_table.html     | 56 +------------------
 1 file changed, 1 insertion(+), 55 deletions(-)

diff --git a/project/npda/templates/partials/patient_table.html b/project/npda/templates/partials/patient_table.html
index 50f6895e..648d7ef8 100644
--- a/project/npda/templates/partials/patient_table.html
+++ b/project/npda/templates/partials/patient_table.html
@@ -1,61 +1,7 @@
 {% load static %}
 {% load npda_tags %}
 {% url 'patients' as patients_url %}
-{% if request.user.view_preference == 1 %}
-  <!-- PDU view   -->
-  <div role="alert" class="alert mt-2 bg-slate-200">
-    <p>
-      <i class="fa-solid fa-users-viewfinder"></i> Showing patients filtered by:
-    </p>
-    <ul class="list-inside list-disc">
-      <li>
-        <b>Audit Year </b>[<span class="p-1 mx-1 font-mono bg-gray-300">{{ selected_audit_year }} only</span>].
-      </li>
-      <li>
-        <b>Patient Diabetic Unit </b>[<span class="p-1 mx-1 font-mono bg-gray-300">{{ pz_code }} only</span>].
-      </li>
-    </ul>
-    <button data-tip="You can change the audit year by using the filters below the navigation menu."
-            class="text-rcpch_pink tooltip p-2 hover:text-rcpch_pink_light_tint1 hover:bg-gray-50"
-            hx-on:click="event.stopPropagation(); window.scrollTo(0, 0); document.getElementById('global_view_preference_wrapper').classList.remove('translate-x-full'); document.getElementById('audit_year_select_id').classList.toggle('animate-[bounce_1s_ease-in-out_1]'); ">
-      <i class="fa-question-circle fas"></i> Change Audit Year
-    </button>
-    <button data-tip="You can change the PDU by using the dropdown below the navigation menu."
-            class="text-rcpch_pink tooltip p-2 hover:text-rcpch_pink_light_tint1 hover:bg-gray-50"
-            hx-on:click="event.stopPropagation(); window.scrollTo(0, 0); document.getElementById('global_view_preference_wrapper').classList.remove('translate-x-full');  window.scrollTo(0, 0); document.getElementById('pz_code_select_id').classList.toggle('animate-[bounce_1s_ease-in-out_1]'); ">
-      <i class="fa-question-circle fas"></i> Change PDU
-    </button>
-    <button class="text-rcpch_pink p-2 hover:text-rcpch_pink_light_tint1 hover:bg-gray-50"
-            hx-on:click="event.stopPropagation(); window.scrollTo(0, 0); document.getElementById('global_view_preference_wrapper').classList.remove('translate-x-full');  document.getElementById('view_preference_2').click();">
-      <i class="fa-solid fa-square-xmark"></i> Remove filter
-    </button>
-  </div>
-{% elif request.user.view_preference == 2 %}
-  <!-- national view -->
-  <!-- PDU view   -->
-  <div role="alert" class="alert mt-2 bg-slate-200">
-    <p>
-      <i class="fa-solid fa-users-viewfinder"></i> Showing patients filtered by:
-    </p>
-    <ul class="list-inside list-disc">
-      <li>
-        <b>Audit Year </b>[<span class="p-1 mx-1 font-mono bg-gray-300">{{ selected_audit_year }} only</span>].
-      </li>
-      <li>
-        <b>National patients</b> [<span class="p-1 mx-1 font-mono bg-gray-300">no filters</span>].
-      </li>
-    </ul>
-    <button data-tip="You can change the audit year by using the filters below the navigation menu."
-            class="text-rcpch_pink tooltip p-2 hover:text-rcpch_pink_light_tint1 hover:bg-gray-50"
-            hx-on:click="event.stopPropagation(); window.scrollTo(0, 0); document.getElementById('global_view_preference_wrapper').classList.remove('translate-x-full'); document.getElementById('audit_year_select_id').classList.toggle('animate-[bounce_1s_ease-in-out_1]'); ">
-      <i class="fa-question-circle fas"></i> Change Audit Year
-    </button>
-    <button class="text-rcpch_pink p-2 hover:text-rcpch_pink_light_tint1 hover:bg-gray-50"
-            hx-on:click="event.stopPropagation();  document.getElementById('global_view_preference_wrapper').classList.remove('translate-x-full'); document.getElementById('view_preference_1').click();">
-      <i class="fa-solid fa-square-plus"></i> Apply PDU Filter
-    </button>
-  </div>
-{% endif %}
+
 {% if patient_list %}
   <div class="w-full overflow-x-scroll">
     <table class="font-montserrat table-md table mt-2 mb-5 text-sm text-left rtl:text-right">

From 4a298d78cde546ccec2588eb0dacbc857bafa04a Mon Sep 17 00:00:00 2001
From: Michael Barton <michael@mbarton.cc>
Date: Sat, 11 Jan 2025 20:35:40 +0000
Subject: [PATCH 2/3] Remove breadcrumbs that don't correspond to the top level
 nav

---
 project/npda/templates/patients.html | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/project/npda/templates/patients.html b/project/npda/templates/patients.html
index 0f6ea858..bc5241e0 100644
--- a/project/npda/templates/patients.html
+++ b/project/npda/templates/patients.html
@@ -5,15 +5,7 @@
   <div hx-get="/patients"
        hx-trigger="patients from:body"
        hx-target="#patient_table">
-    <div class="flex flex-col justify-center px-10">
-      <div class="breadcrumbs text-sm">
-        <ul>
-          <li>
-            <a href="/"><i class="fa-solid fa-house mr-1"></i> Dashboard</a>
-          </li>
-          <li>Questionnaire</li>
-        </ul>
-      </div>
+    <div class="flex flex-col justify-center px-10 mt-5">
       <div class="flex flex-wrap">
         <label class="form-control flex items-center gap-2 grow">
           <label class="bg-rcpch_strong_blue mx-6 text-white input flex items-center gap-2 w-full h-auto">

From 1eb4a7df945aa3f89127b3dc62f1b8b857a89678 Mon Sep 17 00:00:00 2001
From: Michael Barton <michael@mbarton.cc>
Date: Sat, 11 Jan 2025 20:48:08 +0000
Subject: [PATCH 3/3] Remove the quick access panel

---
 project/npda/templates/patients.html | 82 ++++++++--------------------
 1 file changed, 22 insertions(+), 60 deletions(-)

diff --git a/project/npda/templates/patients.html b/project/npda/templates/patients.html
index bc5241e0..68b83313 100644
--- a/project/npda/templates/patients.html
+++ b/project/npda/templates/patients.html
@@ -33,69 +33,31 @@
             <div id="search_spinner"
                  class="htmx-indicator flex items-center px-4 text-white absolute right-14 loading loading-bars loading-sm">
             </div>
+            <button class="btn btn-info h-auto w-full md:w-auto"
+                    hx-include="#search-input"
+                    hx-swap="innerHTML"
+                    hx-target="#patient_table"
+                    hx-trigger="click"
+                    hx-indicator="#search_spinner"
+                    hx-get="{% url 'patients' %}"
+                    hx-disabled-elt="this">
+              <span class="md:hidden text-white">Search patients</span>
+              <i class="fa-solid fa-magnifying-glass text-white"></i>
+            </button>
+            <div class="divider divider-horizontal after:bg-rcpch_strong_blue_light_tint1 before:bg-rcpch_strong_blue_light_tint3 hidden lg:flex">
+            </div>
+            {% if perms.npda.add_patient %}
+                <a href="{% url 'patient-add' %}"
+                  class="btn btn-info h-auto w-full md:w-auto {% if not can_alter_this_audit_year_submission %} btn-disabled {% endif %}">
+                  <i class="fa-solid fa-person-circle-plus"></i>
+                  Add patient
+                </a>
+            {% endif %}
           </label>
         </label>
-        <button class="btn btn-info h-auto w-full md:w-auto"
-                hx-include="#search-input"
-                hx-swap="innerHTML"
-                hx-target="#patient_table"
-                hx-trigger="click"
-                hx-indicator="#search_spinner"
-                hx-get="{% url 'patients' %}"
-                hx-disabled-elt="this">
-          <span class="md:hidden text-white">Search patients</span>
-          <i class="fa-solid fa-magnifying-glass text-white"></i>
-        </button>
       </div>
-      <div>
-        <div>
-          <div class="relative">
-            <div class="mt-1 menu bg-base-200 lg:menu-horizontal rounded-box w-full shadow-sm shadow-rcpch_strong_blue_dark_tint mb-2">
-              <div class="flex sm:hidden divider m-0 h-auto font-bold">Quick access</div>
-              <div class="hidden sm:flex divider divider-vertical m-0 h-auto font-bold">
-                Quick access
-              </div>
-              <div class="flex justify-items-stretch grow align-middle justify-between flex-wrap">
-                <ul class="flex items-center flex-wrap grow">
-                  <li>
-                    <a href="{% url 'patients' %}">
-                      <i class="fa-solid fa-hospital-user"></i>Patient Index
-                      <span class="badge badge-sm">ALL</span>
-                    </a>
-                  </li>
-                </ul>
-                <ul class="flex items-center flex-wrap">
-                  <li>
-                    <div class="tooltip tooltip-bottom" data-tip="No updates to display.">
-                      <button class="opacity-40" disabled>
-                        <i class="fa-solid fa-circle-exclamation"></i> Notifications
-                      </button>
-                    </div>
-                  </li>
-                  {% if perms.npda.add_patient %}
-                    <li>
-                      {% if can_alter_this_audit_year_submission %}
-                        <a href="{% url 'patient-add' %}"
-                           class="underline decoration-rcpch_strong_blue hover:decoration-rcpch_pink decoration-2 underline-offset-4">
-                          <i class="fa-solid fa-person-circle-plus"></i>
-                          Add child
-                        </a>
-                      {% else %}
-                        <span class="underline decoration-rcpch_strong_blue decoration-2 underline-offset-4 opacity-40 pointer-events-none">
-                          <i class="fa-solid fa-person-circle-plus"></i>
-                          Add child
-                        </span>
-                      {% endif %}
-                    </li>
-                  {% endif %}
-                </ul>
-              </div>
-            </div>
-            <div id="patient_table">
-              {% include 'partials/patient_table.html' with patient_list=patient_list index_of_first_invalid_patient=index_of_first_invalid_patient total_invalid_patients=total_invalid_patients %}
-            </div>
-          </div>
-        </div>
+      <div id="patient_table">
+        {% include 'partials/patient_table.html' with patient_list=patient_list index_of_first_invalid_patient=index_of_first_invalid_patient total_invalid_patients=total_invalid_patients %}
       </div>
     </div>
   </div>