From 7bf25176fcd22de38aafebc8883b95549813338b Mon Sep 17 00:00:00 2001
From: Danny Cowen <danny.cowen9821@gmail.com>
Date: Fri, 31 May 2024 15:30:38 +0100
Subject: [PATCH 01/14] Redesigns visit form colouring and adds error message
 continuity from Patient Visit list to visit form

---
 project/npda/templates/npda/visit_form.html | 18 +++++++++---------
 project/npda/views/visit.py                 | 18 ++++++++++++++++++
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/project/npda/templates/npda/visit_form.html b/project/npda/templates/npda/visit_form.html
index ba47c119..26e9d0a9 100644
--- a/project/npda/templates/npda/visit_form.html
+++ b/project/npda/templates/npda/visit_form.html
@@ -2,8 +2,8 @@
 {% load npda_tags %}
 {% csrf_token %}
 {% block content %}
-<div class="bg-rcpch_light_blue py-8">
-  <div class="w-full max-w-3xl mx-auto px-2 py-4 m-2 shadow-md bg-white font-montserrat">
+<div class="flex justify-center bg-white py-8">
+  <div class="w-full mx-96 px-2 py-4 m-2 shadow-md bg-white font-montserrat">
     <strong>{{title}}</strong>
     <form id="update-form" method="post" {% if form_method == "create" %} action="{% url 'visit-create' patient_id %}" {% else %} action="{% url 'visit-update' patient_id=patient_id pk=visit.pk %}" {% endif %}>
       {% csrf_token %}
@@ -29,10 +29,10 @@
 
       <div role="tablist" class="tabs tabs-bordered">
         <input type="radio" name="my_tabs_1" role="tab" class="tab" aria-label="Routine&nbsp;Measurements" checked/>
-        <div role="tabpanel" class="tab-content bg-base-100 border-base-300 rounded-none p-6">
+        <div role="tabpanel" class="tab-content bg-base-100 border-base-300 rounded-none">
         {% for field_category in form.categories %}
           {% with field_category|colour_for_category as background_colour %}
-          {% if field_category == "Measurements" or field_category == "HBA1c" or field_category == "Treatment" or field_category == "CGM" %}
+          {% if field_category == "Measurements" or field_category == "HBA1c" or field_category == "Treatment" or field_category == "CGM" or field_category == "BP"%}
             <div class="flex flex-col mb-6 {% if background_colour %} bg-{{background_colour}} {% endif %}">
             {% for field in form %}
                 {% if field.field.category == field_category %}
@@ -71,18 +71,18 @@
         <div role="tabpanel" class="tab-content bg-base-100 border-base-300 rounded-none p-6">
           {% for field_category in form.categories %}
             {% with field_category|colour_for_category as background_colour %}
-            {% if field_category == "BP" or field_category == "Foot Care" or field_category == "DECS" or field_category == "ACR" or field_category == "Cholesterol" or field_category == "Thyroid" or field_category == "Coeliac" or field_category == "Psychology" or field_category == "Smoking" or field_category == "Dietician" or field_category == "Sick Day Rules" or field_category == "Immunisation (flu)" %}
-              <div class="collapse collapse-arrow my-2 bg-base-200">
+            {% if field_category == "Foot Care" or field_category == "DECS" or field_category == "ACR" or field_category == "Cholesterol" or field_category == "Thyroid" or field_category == "Coeliac" or field_category == "Psychology" or field_category == "Smoking" or field_category == "Dietician" or field_category == "Sick Day Rules" or field_category == "Immunisation (flu)" %}
+              <div class="collapse collapse-arrow my-2 bg-base-200 rounded-none {% if field_category in categories_with_errors %} bg-rcpch_red {% elif field_category in categories_without_errors %} bg-rcpch_pink {% else %} bg-rcpch_dark_blue {% endif %}">
                 <input type="radio" name="my-accordion-3" checked="checked" /> 
-                <div class="collapse-title text-xl font-medium">
+                <div class="collapse-title text-xl font-medium text-white">
                   <strong>{{field_category}}</strong>
                 </div>
-                <div class="collapse-content flex flex-col mb-6 {% if background_colour %} bg-{{background_colour}} {% endif %}">
+                <div class="collapse-content flex flex-col mb-6 text-lg {% if field_category in categories_with_errors %} bg-rcpch_red {% elif field_category in categories_without_errors %} bg-rcpch_pink {% else %} bg-rcpch_dark_blue {% endif %}">
                   {% for field in form %}
                     {% if field.field.category == field_category %}
                     <div class="flex flex-row my-2 mx-2">
                       <div class="flex items-center justify-center md:w-1/3">
-                        <label for="{{ field.id_for_label }}" class="{% if background_colour == "rcpch_dark_blue" %} text-white-700 {% else %} text-gray-700 {% endif %} block font-bold md:text-center mb-1 md:mb-0 pr-4"><small>{{ field.label }}</small></label>
+                        <label for="{{ field.id_for_label }}" class="text-white block font-bold mb-1 md:mb-0 pr-4 text-left"><small>{{ field.label }}</small></label>
                       </div>
                       <div class="flex space-between md:w-2/3">
                       {% if field.field.widget|is_select %}
diff --git a/project/npda/views/visit.py b/project/npda/views/visit.py
index 2c120f94..7fab9caa 100644
--- a/project/npda/views/visit.py
+++ b/project/npda/views/visit.py
@@ -8,6 +8,7 @@
 from django.views.generic.edit import CreateView, UpdateView, DeleteView
 from django.views.generic import ListView
 from django.urls import reverse_lazy, reverse
+import logging
 
 # Third party imports
 from two_factor.views.mixins import OTPRequiredMixin
@@ -17,6 +18,8 @@
 from ..forms.visit_form import VisitForm
 from ..general_functions import get_visit_categories
 
+logger = logging.getLogger(__name__)
+
 
 class PatientVisitsListView(LoginRequiredMixin, OTPRequiredMixin, ListView):
     model = Visit
@@ -81,6 +84,21 @@ def get_context_data(self, **kwargs):
         context["title"] = "Edit Visit Details"
         context["button_title"] = "Edit Visit Details"
         context["form_method"] = "update"
+        visit_instance = Visit.objects.get(pk=self.kwargs["pk"])
+        visit_categories = get_visit_categories(visit_instance)
+        context["visit_categories"] = visit_categories
+        categories_with_errors = []
+        categories_without_errors = []
+        for category in visit_categories:
+            print(category)
+            if category["has_error"] == False:
+                print("BELOW is category.category")
+                print(category["category"])
+                categories_without_errors.append(category["category"])
+            else:
+                categories_with_errors.append(category["category"])
+        context["categories_with_errors"] = categories_with_errors
+        context["categories_without_errors"] = categories_without_errors
         return context
 
     def get_success_url(self):

From 82fb02fc588b7446a5bd0e5df0afe1b163a2c4b8 Mon Sep 17 00:00:00 2001
From: Danny Cowen <danny.cowen9821@gmail.com>
Date: Fri, 31 May 2024 15:32:22 +0100
Subject: [PATCH 02/14] Remove print statements from debugging, and remove
 logger

---
 project/npda/views/visit.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/project/npda/views/visit.py b/project/npda/views/visit.py
index 7fab9caa..0cd5539a 100644
--- a/project/npda/views/visit.py
+++ b/project/npda/views/visit.py
@@ -8,7 +8,6 @@
 from django.views.generic.edit import CreateView, UpdateView, DeleteView
 from django.views.generic import ListView
 from django.urls import reverse_lazy, reverse
-import logging
 
 # Third party imports
 from two_factor.views.mixins import OTPRequiredMixin
@@ -18,7 +17,7 @@
 from ..forms.visit_form import VisitForm
 from ..general_functions import get_visit_categories
 
-logger = logging.getLogger(__name__)
+
 
 
 class PatientVisitsListView(LoginRequiredMixin, OTPRequiredMixin, ListView):
@@ -90,10 +89,7 @@ def get_context_data(self, **kwargs):
         categories_with_errors = []
         categories_without_errors = []
         for category in visit_categories:
-            print(category)
             if category["has_error"] == False:
-                print("BELOW is category.category")
-                print(category["category"])
                 categories_without_errors.append(category["category"])
             else:
                 categories_with_errors.append(category["category"])

From 82da30b1363bd72284c1b9f00d4e1a976f2760b8 Mon Sep 17 00:00:00 2001
From: Danny Cowen <danny.cowen9821@gmail.com>
Date: Fri, 31 May 2024 10:22:30 +0100
Subject: [PATCH 03/14] Adds hyperscript

---
 project/npda/templates/base.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/project/npda/templates/base.html b/project/npda/templates/base.html
index 28ac006f..5022e36c 100644
--- a/project/npda/templates/base.html
+++ b/project/npda/templates/base.html
@@ -19,15 +19,16 @@
   <link href="{% static 'tailwind.css' %}" rel="stylesheet">
   <link href="https://fonts.cdnfonts.com/css/arial-2" rel="stylesheet">
   <script src="https://unpkg.com/htmx.org@1.9.11/dist/htmx.js" integrity="sha384-l9bYT9SL4CAW0Hl7pAOpfRc18mys1b0wK4U8UtGnWOxPVbVMgrOdB+jyz/WY8Jue" crossorigin="anonymous"></script>
+  <script src="https://unpkg.com/hyperscript.org@0.9.12"></script>
   <!-- not for production -->
   <link href="https://cdn.jsdelivr.net/npm/daisyui@4.11.1/dist/full.min.css" rel="stylesheet" type="text/css" />
   <style type="text/tailwindcss">
     @layer components {
       .rcpch-light-blue-btn {
-        @apply bg-rcpch_light_blue text-white font-semibold hover:text-white py-2 px-3 mt-20 border border-rcpch_light_blue hover:bg-rcpch_strong_blue hover:border-rcpch_strong_blue rounded-none;
+        @apply bg-rcpch_light_blue text-white font-semibold hover:text-white py-2 px-3 border border-rcpch_light_blue hover:bg-rcpch_strong_blue hover:border-rcpch_strong_blue rounded-none;
       }
       .rcpch-btn {
-        @apply text-white font-semibold hover:text-white py-2.5 px-3 mt-20 border border-rcpch_yellow_light_tint1 hover:bg-rcpch_yellow hover:border-rcpch_yellow rounded-none;
+        @apply text-white font-semibold hover:text-white py-2.5 px-3 border border-rcpch_yellow_light_tint1 hover:bg-rcpch_yellow hover:border-rcpch_yellow rounded-none;
       }
       .rcpch-input-text {
         @apply shadow appearance-none border border-rcpch_light_blue border-4 focus:border-rcpch_pink hover:border-rcpch_pink w-full py-2 px-3 text-gray-700 leading-tight focus:outline-none rounded-none;

From c45c3336b20e736090b6bd27d1c9cfb52cba4205 Mon Sep 17 00:00:00 2001
From: Danny Cowen <danny.cowen9821@gmail.com>
Date: Fri, 31 May 2024 10:22:30 +0100
Subject: [PATCH 04/14] Adds Today button to date input fields

---
 project/npda/templates/npda/visit_form.html | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/project/npda/templates/npda/visit_form.html b/project/npda/templates/npda/visit_form.html
index ba47c119..2d1f37b7 100644
--- a/project/npda/templates/npda/visit_form.html
+++ b/project/npda/templates/npda/visit_form.html
@@ -15,7 +15,7 @@
             </div>
             <div class="md:w-2/3">
               {% if field.id_for_label == "id_visit_date" %}
-                <input type="date" id="{{ field.id_for_label }}" name="{{ field.html_name }}" class="input rcpch-input-text" {% if field.value %} value={{ field.value|date:"Y-m-d" }} {% elif form_method == "create" %} value={% today_date %} {% endif %}>
+                <input type="date" id="{{ field.id_for_label }}" name="{{ field.html_name }}" class="input rcpch-input-text" {% if field.value %} value={{ field.value|date:"Y-m-d" }} {% endif %}>
               {% endif %}
               {% for error in field.errors %}
                 <p>
@@ -48,7 +48,8 @@
                         {% endfor %}
                       </select>
                   {% elif field.field.widget|is_dateinput %}
-                    <input type="date" id="{{ field.id_for_label }}" name="{{ field.html_name }}" class="input rcpch-input-text" {% if field.value %} value={{ field.value|date:"Y-m-d" }} {% elif form_method == "create" %} value={% today_date %} {% endif %}>
+                    <input type="date" id="{{ field.id_for_label }}" name="{{ field.html_name }}" class="input rcpch-input-text" {% if field.value %} value={{ field.value|date:"Y-m-d" }} {% endif %}>
+                    <button type='button' _="on click set #{{ field.id_for_label}}'s value to '{% today_date %}'" class="btn rcpch-btn bg-rcpch_light_blue border border-rcpch_light_blue hover:bg-rcpch_strong_blue hover:border-rcpch_strong_blue">Today</button>
                   {% else %}
                       <input type="text" id="{{ field.id_for_label }}" name="{{ field.html_name }}" class="input rcpch-input-text rounded-none" {% if field.field.required %} placeholder="Required" {% endif %} {% if field.value %} value={{ field.value }} {% elif field.value == 0 %} value="0.0" {% endif %}>
                   {% endif %}
@@ -92,7 +93,8 @@
                             {% endfor %}
                           </select>
                       {% elif field.field.widget|is_dateinput %}
-                          <input type="date" id="{{ field.id_for_label }}" name="{{ field.html_name }}" class="input rcpch-input-text" {% if field.value %} value={{ field.value|date:"Y-m-d" }} {% elif form_method == "create" %} value={% today_date %} {% endif %}>
+                          <input type="date" id="{{ field.id_for_label }}" name="{{ field.html_name }}" class="input rcpch-input-text" {% if field.value %} value={{ field.value|date:"Y-m-d" }} {% endif %}>
+                          <button type='button' _="on click set #{{ field.id_for_label}}'s value to '{% today_date %}'" class="btn rcpch-btn bg-rcpch_light_blue border border-rcpch_light_blue hover:bg-rcpch_strong_blue hover:border-rcpch_strong_blue">Today</button>
                       {% else %}
                           <input type="text" id="{{ field.id_for_label }}" name="{{ field.html_name }}" class="input rcpch-input-text rounded-none" {% if field.field.required %} placeholder="Required" {% endif %} {% if field.value %} value={{ field.value }} {% elif field.value == 0 %} value="0.0" {% endif %}>
                       {% endif %}
@@ -133,6 +135,7 @@
                       </select>
                   {% elif field.field.widget|is_dateinput %}
                       <input type="date" id="{{ field.id_for_label }}" name="{{ field.html_name }}" class="input rcpch-input-text" {% if field.value %} value={{ field.value|date:"Y-m-d" }} {% endif %}>
+                      <button type='button' _="on click set #{{ field.id_for_label}}'s value to '{% today_date %}'" class="btn rcpch-btn bg-rcpch_light_blue border border-rcpch_light_blue hover:bg-rcpch_strong_blue hover:border-rcpch_strong_blue">Today</button>
                   {% else %}
                       <input type="text" id="{{ field.id_for_label }}" name="{{ field.html_name }}" class="input rcpch-input-text rounded-none" {% if field.field.required %} placeholder="Required" {% endif %} {% if field.value %} value={{ field.value }} {% elif field.value == 0 %} value="0.0" {% endif %}>
                   {% endif %}

From 48f85c71ec143bef68678be42da5e0dc76e7aeba Mon Sep 17 00:00:00 2001
From: Danny Cowen <danny.cowen9821@gmail.com>
Date: Fri, 31 May 2024 10:24:41 +0100
Subject: [PATCH 05/14] Add today button + styling to Appointment Date field in
 Visit form

---
 project/npda/templates/npda/visit_form.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/project/npda/templates/npda/visit_form.html b/project/npda/templates/npda/visit_form.html
index 2d1f37b7..656da871 100644
--- a/project/npda/templates/npda/visit_form.html
+++ b/project/npda/templates/npda/visit_form.html
@@ -13,9 +13,10 @@
             <div class="md:w-1/3">
                 <label for="{{ field.id_for_label }}" class="block text-gray-700 font-bold md:text-center mb-1 md:mb-0 pr-4"><small>{{ field.label }}</small></label>
             </div>
-            <div class="md:w-2/3">
+            <div class="flex space-between md:w-2/3">
               {% if field.id_for_label == "id_visit_date" %}
                 <input type="date" id="{{ field.id_for_label }}" name="{{ field.html_name }}" class="input rcpch-input-text" {% if field.value %} value={{ field.value|date:"Y-m-d" }} {% endif %}>
+                <button type='button' _="on click set #{{ field.id_for_label}}'s value to '{% today_date %}'" class="btn rcpch-btn bg-rcpch_light_blue border border-rcpch_light_blue hover:bg-rcpch_strong_blue hover:border-rcpch_strong_blue">Today</button>
               {% endif %}
               {% for error in field.errors %}
                 <p>

From 676d5c04249bd286ae2d633acc86b1e75e2d6370 Mon Sep 17 00:00:00 2001
From: Danny Cowen <danny.cowen9821@gmail.com>
Date: Fri, 31 May 2024 16:12:03 +0100
Subject: [PATCH 06/14] Fixes delete button margin top

---
 project/npda/templates/npda/visit_form.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/npda/templates/npda/visit_form.html b/project/npda/templates/npda/visit_form.html
index 656da871..3c8e7c22 100644
--- a/project/npda/templates/npda/visit_form.html
+++ b/project/npda/templates/npda/visit_form.html
@@ -164,7 +164,7 @@
         <button type="submit" value="Submit" class="btn rcpch-btn bg-rcpch_light_blue border border-rcpch_light_blue hover:bg-rcpch_strong_blue hover:border-rcpch_strong_blue">{{button_title}}</button>
         <a class="btn rcpch-btn bg-rcpch_yellow_light_tint1 border border-rcpch_yellow_light_tint1 hover:bg-rcpch_yellow hover:border-rcpch_yellow" href="{% url 'patient_visits' patient_id=patient_id %}">Cancel</a>
         {% if form_method == 'update' %}
-        <a class="btn rcpch-btn bg-rcpch_red text-white font-semibold hover:text-white py-2.5 px-3 mt-20 border border-rcpch_red hover:bg-rcpch_red_dark_tint hover:border-rcpch_red_dark_tint" href="{% url 'visit-delete' patient_id visit.pk %}">Delete</a>
+        <a class="btn rcpch-btn bg-rcpch_red text-white font-semibold hover:text-white py-2.5 px-3 border border-rcpch_red hover:bg-rcpch_red_dark_tint hover:border-rcpch_red_dark_tint" href="{% url 'visit-delete' patient_id visit.pk %}">Delete</a>
         {% endif %}
       </div>
     </form>

From e90108d636b698ad3825aeb549fc6a5baa23e678 Mon Sep 17 00:00:00 2001
From: anchit-chandran <anchit97123@gmail.com>
Date: Sat, 1 Jun 2024 11:47:36 +0100
Subject: [PATCH 07/14] rm un-needed app-level urls as tf_urls handling

Signed-off-by: anchit-chandran <anchit97123@gmail.com>
---
 project/npda/urls.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/project/npda/urls.py b/project/npda/urls.py
index 61dba1e8..af83997d 100644
--- a/project/npda/urls.py
+++ b/project/npda/urls.py
@@ -1,5 +1,5 @@
 from django.urls import path, include
-from django.contrib.auth.views import PasswordResetConfirmView, LogoutView
+from django.contrib.auth.views import PasswordResetConfirmView
 from django.contrib.auth import urls as auth_urls
 from project.npda.views import (
     VisitCreateView,
@@ -13,8 +13,6 @@
 from .views import *
 
 urlpatterns = [
-    path("captcha/", include("captcha.urls")),
-    path("account/", include(auth_urls)),
     path("home", view=home, name="home"),
     # Patient views
     path("patients", view=PatientListView.as_view(), name="patients"),
@@ -68,7 +66,7 @@
         view=NPDAUserDeleteView.as_view(),
         name="npdauser-delete",
     ),
-    # authentication
+    # Authentication -> NOTE: 2FA is implemented in project-level URLS with tf_urls
     path("captcha/", include("captcha.urls")),
     path("account/", include(auth_urls)),
     path(
@@ -84,6 +82,4 @@
         ),
         name="password_reset_confirm",
     ),
-    path("account/login", view=RCPCHLoginView.as_view(), name="login"),
-    path("account/logout", view=LogoutView.as_view(), name="logout"),
 ]

From cd63ad7c7658ec4398e3729c76945c094af6f12c Mon Sep 17 00:00:00 2001
From: anchit-chandran <anchit97123@gmail.com>
Date: Sat, 1 Jun 2024 11:47:42 +0100
Subject: [PATCH 08/14] reformat

Signed-off-by: anchit-chandran <anchit97123@gmail.com>
---
 .../templates/two_factor/_wizard_actions.html | 43 ++++++++++---------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/project/npda/templates/two_factor/_wizard_actions.html b/project/npda/templates/two_factor/_wizard_actions.html
index 625c846d..23f38339 100644
--- a/project/npda/templates/two_factor/_wizard_actions.html
+++ b/project/npda/templates/two_factor/_wizard_actions.html
@@ -1,33 +1,34 @@
 {% load i18n %}
 
 <div class="flex flex-col justify-center items-center">
-  
-    <button type="submit" class="bg-rcpch_light_blue text-white font-semibold hover:text-white py-2.5 px-3 mt-5 border border-rcpch_light_blue hover:bg-rcpch_strong_blue hover:border-rcpch_strong_blue">
-      {% trans "Next" %}
-    </button>
-  
+
+  <button type="submit"
+    class="bg-rcpch_light_blue text-white font-semibold hover:text-white py-2.5 px-3 mt-5 border border-rcpch_light_blue hover:bg-rcpch_strong_blue hover:border-rcpch_strong_blue">
+    {% trans "Next" %}
+  </button>
+
   {% if wizard.steps.prev %}
-  <!-- <div> -->
-    <button
-      name="wizard_goto_step"
-      type="submit"
-      value="{{ wizard.steps.prev }}"
-      class="justify-center items-center bg-rcpch_light_blue text-white font-semibold hover:text-white py-2.5 px-3 mt-5 border border-rcpch_light_blue hover:bg-rcpch_strong_blue hover:border-rcpch_strong_blue"
-    >
-      Back
-    </button>
-  </div>
-  {% endif %}
-<!-- </div> -->
+  <button name="wizard_goto_step" type="submit" value="{{ wizard.steps.prev }}"
+    class="justify-center items-center bg-rcpch_light_blue text-white font-semibold hover:text-white py-2.5 px-3 mt-5 border border-rcpch_light_blue hover:bg-rcpch_strong_blue hover:border-rcpch_strong_blue">
+    Back
+  </button>
+</div>
+{% endif %}
 
 <!--IF NO PREV BUTTON -> MUST BE AT FIRST SIGNIN PAGE -->
 {% if not wizard.steps.prev %}
 <div class="flex flex-col justify-center items-center">
-  <a href="{% url 'password_reset' %}" class="bg-rcpch_light_blue text-white font-semibold hover:text-white py-2.5 px-3 mt-5 border border-rcpch_light_blue hover:bg-rcpch_strong_blue hover:border-rcpch_strong_blue">Reset Password</a>
+  <a href="{% url 'password_reset' %}"
+    class="bg-rcpch_light_blue text-white font-semibold hover:text-white py-2.5 px-3 mt-5 border border-rcpch_light_blue hover:bg-rcpch_strong_blue hover:border-rcpch_strong_blue">Reset
+    Password</a>
   <div class="mt-5">
-    <div class="mt-2 bg-gray-100 border border-gray-200 text-sm text-gray-800 rounded-lg p-4 dark:bg-white/10 dark:border-white/20 dark:text-white font-montserrat" role="alert">
-      <span class="font-bold">NOTE</span> For users of the old platform, you will require a new username and password to access this new platform. Please contact your Lead Clinician or <a href="mailto:npda@rcpch.ac.uk">npda@rcpch.ac.uk</a> for assistance. 
+    <div
+      class="mt-2 bg-gray-100 border border-gray-200 text-sm text-gray-800 rounded-lg p-4 dark:bg-white/10 dark:border-white/20 dark:text-white font-montserrat"
+      role="alert">
+      <span class="font-bold">NOTE</span> For users of the old platform, you will require a new username and password to
+      access this new platform. Please contact your Lead Clinician or <a
+        href="mailto:npda@rcpch.ac.uk">npda@rcpch.ac.uk</a> for assistance.
     </div>
   </div>
 </div>
-{% endif %}
+{% endif %}
\ No newline at end of file

From 9922aa37a7997970f725b5954793971b5bf672ec Mon Sep 17 00:00:00 2001
From: anchit-chandran <anchit97123@gmail.com>
Date: Sat, 1 Jun 2024 11:47:58 +0100
Subject: [PATCH 09/14] add login_and_otp_required decorator for any functional
 views

Signed-off-by: anchit-chandran <anchit97123@gmail.com>
---
 project/npda/views/decorators.py | 47 ++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 project/npda/views/decorators.py

diff --git a/project/npda/views/decorators.py b/project/npda/views/decorators.py
new file mode 100644
index 00000000..f6a7b0ef
--- /dev/null
+++ b/project/npda/views/decorators.py
@@ -0,0 +1,47 @@
+# python imports
+import logging
+
+from django.conf import settings
+from django.core.exceptions import PermissionDenied
+from django.contrib.auth.decorators import login_required
+
+# Logging setup
+logger = logging.getLogger(__name__)
+
+def login_and_otp_required():
+    """
+    Must have verified via 2FA
+    """
+
+    def decorator(view):
+        # First use login_required on decorator
+        login_required(view)
+        
+        
+
+        def wrapper(request, *args, **kwargs):
+            # Then, ensure 2fa verified
+            user = request.user
+
+            # Bypass 2fa if local dev, with warning message
+            if settings.DEBUG and user.is_superuser:
+                logger.warning(
+                    "User %s has bypassed 2FA for %s as settings.DEBUG is %s and user is superuser",
+                    user,
+                    view,
+                    settings.DEBUG,
+                )
+                return view(request, *args, **kwargs)
+
+            # Prevent unverified users
+            if not user.is_verified():
+                user_list = user.__dict__
+                epilepsy12_user = user_list['_wrapped']
+                logger.info("User %s is unverified. Tried accessing %s", epilepsy12_user , view.__qualname__)
+                raise PermissionDenied('Unverified user')
+
+            return view(request, *args, **kwargs)
+
+        return wrapper
+
+    return decorator
\ No newline at end of file

From d691982cec7d66061e330af0683fb4e1039bb571 Mon Sep 17 00:00:00 2001
From: anchit-chandran <anchit97123@gmail.com>
Date: Sat, 1 Jun 2024 11:48:12 +0100
Subject: [PATCH 10/14] use login_and_otp_required decorator for home
 functional view

Signed-off-by: anchit-chandran <anchit97123@gmail.com>
---
 project/npda/views/home.py | 34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/project/npda/views/home.py b/project/npda/views/home.py
index 4b63dfb7..51d22572 100644
--- a/project/npda/views/home.py
+++ b/project/npda/views/home.py
@@ -1,28 +1,26 @@
 from django.shortcuts import get_object_or_404, redirect, render
 from django.urls import reverse
-from django.contrib.auth.decorators import login_required
-from django_otp.decorators import otp_required
 from django.contrib import messages
+
 from ..general_functions import csv_upload
 from ..forms.upload import UploadFileForm
 from ..models import Patient, Visit
+from .decorators import login_and_otp_required
 
 
-@login_required
+@login_and_otp_required()
 def home(request):
-    if request.user.is_verified():
-        file_uploaded = False
-        if request.method == "POST":
-            form = UploadFileForm(request.POST, request.FILES)
-            file = request.FILES["csv_upload"]
-            file_uploaded = csv_upload(csv_file=file)
-            if file_uploaded["status"]==500:
-                messages.error(request=request,message=f"{file_uploaded["errors"]}")
-                return redirect('home')
-        else:
-            form = UploadFileForm()
-        context = {"file_uploaded": file_uploaded, "form": form}
-        template = "home.html"
-        return render(request=request, template_name=template, context=context)
+
+    file_uploaded = False
+    if request.method == "POST":
+        form = UploadFileForm(request.POST, request.FILES)
+        file = request.FILES["csv_upload"]
+        file_uploaded = csv_upload(csv_file=file)
+        if file_uploaded["status"]==500:
+            messages.error(request=request,message=f"{file_uploaded["errors"]}")
+            return redirect('home')
     else:
-        return redirect(reverse("two_factor:profile"))
+        form = UploadFileForm()
+    context = {"file_uploaded": file_uploaded, "form": form}
+    template = "home.html"
+    return render(request=request, template_name=template, context=context)

From 013d7296b59cfa10169a8006ebc2e9a6e91559c6 Mon Sep 17 00:00:00 2001
From: anchit-chandran <anchit97123@gmail.com>
Date: Sat, 1 Jun 2024 11:48:28 +0100
Subject: [PATCH 11/14] adds LoginAndOTPRequiredMixin for CBVs

Signed-off-by: anchit-chandran <anchit97123@gmail.com>
---
 project/npda/views/mixins.py     | 44 ++++++++++++++++++++++++++++++++
 project/npda/views/npda_users.py | 17 ++++++------
 project/npda/views/patient.py    |  9 ++++---
 project/npda/views/visit.py      | 11 ++++----
 4 files changed, 63 insertions(+), 18 deletions(-)
 create mode 100644 project/npda/views/mixins.py

diff --git a/project/npda/views/mixins.py b/project/npda/views/mixins.py
new file mode 100644
index 00000000..865e2e6a
--- /dev/null
+++ b/project/npda/views/mixins.py
@@ -0,0 +1,44 @@
+"""Defines custom mixins used throughout our Class Based Views"""
+
+import logging
+
+from django.conf import settings
+from django.core.exceptions import PermissionDenied
+from django.contrib.auth.mixins import AccessMixin
+
+logger = logging.getLogger(__name__)
+
+
+class LoginAndOTPRequiredMixin(AccessMixin):
+    """
+    Mixin that ensures the user is logged in and has verified via OTP.
+
+    Bypassed in local development is user.is_superuser AND settings.DEBUG==True.
+    """
+
+    def dispatch(self, request, *args, **kwargs):
+        logger.warning('inside MIXIN')
+        # Check if the user is authenticated
+        if not request.user.is_authenticated:
+            return self.handle_no_permission()
+
+        # Check if the user is superuser and bypass 2FA in debug mode
+        if settings.DEBUG and request.user.is_superuser:
+            logger.warning(
+                "User %s has bypassed 2FA for %s as settings.DEBUG is %s and user is superuser",
+                request.user,
+                self.__class__.__name__,
+                settings.DEBUG,
+            )
+            return super().dispatch(request, *args, **kwargs)
+
+        # Check if the user is verified
+        if not request.user.is_verified():
+            logger.info(
+                "User %s is unverified. Tried accessing %s",
+                request.user,
+                self.__class__.__name__,
+            )
+            raise PermissionDenied()
+
+        return super().dispatch(request, *args, **kwargs)
diff --git a/project/npda/views/npda_users.py b/project/npda/views/npda_users.py
index f9bfd62f..b9fb602d 100644
--- a/project/npda/views/npda_users.py
+++ b/project/npda/views/npda_users.py
@@ -1,19 +1,19 @@
 from datetime import datetime, timedelta
 import logging
+
 from django.http import HttpRequest, HttpResponse
 from django.utils import timezone
 from django.shortcuts import redirect
 from django.views.generic.edit import CreateView, UpdateView, DeleteView
 from django.views.generic import ListView
 from django.contrib.auth.views import PasswordResetView
-from django.contrib.auth.mixins import LoginRequiredMixin
 from django.urls import reverse_lazy, reverse
 from django.contrib.messages.views import SuccessMessageMixin
 from django.contrib import messages
 from django.utils.html import strip_tags
 from django.conf import settings
 from two_factor.views import LoginView as TwoFactorLoginView
-from two_factor.views.mixins import OTPRequiredMixin
+
 from ..models import NPDAUser, VisitActivity
 from ..forms.npda_user_form import NPDAUserForm, CaptchaAuthenticationForm
 from ..general_functions import (
@@ -23,6 +23,7 @@
     construct_transfer_npda_site_outcome_email,
     group_for_role,
 )
+from .mixins import LoginAndOTPRequiredMixin
 
 logger = logging.getLogger(__name__)
 
@@ -31,7 +32,7 @@
 """
 
 
-class NPDAUserListView(LoginRequiredMixin, OTPRequiredMixin, ListView):
+class NPDAUserListView(LoginAndOTPRequiredMixin, ListView):
     template_name = "npda_users.html"
 
     def get_queryset(self):
@@ -39,7 +40,7 @@ def get_queryset(self):
 
 
 class NPDAUserCreateView(
-    LoginRequiredMixin, OTPRequiredMixin, SuccessMessageMixin, CreateView
+    LoginAndOTPRequiredMixin, SuccessMessageMixin, CreateView
 ):
     """
     Handle creation of new patient in audit
@@ -115,7 +116,7 @@ def get_success_url(self) -> str:
 
 
 class NPDAUserUpdateView(
-    LoginRequiredMixin, OTPRequiredMixin, SuccessMessageMixin, UpdateView
+    LoginAndOTPRequiredMixin, SuccessMessageMixin, UpdateView
 ):
     """
     Handle update of patient in audit
@@ -166,7 +167,7 @@ def post(self, request: HttpRequest, *args: str, **kwargs) -> HttpResponse:
 
 
 class NPDAUserDeleteView(
-    LoginRequiredMixin, OTPRequiredMixin, SuccessMessageMixin, DeleteView
+    LoginAndOTPRequiredMixin, SuccessMessageMixin, DeleteView
 ):
     """
     Handle deletion of child from audit
@@ -177,7 +178,7 @@ class NPDAUserDeleteView(
     success_url = reverse_lazy("npda_users")
 
 
-class NPDAUserLogsListView(LoginRequiredMixin, OTPRequiredMixin, ListView):
+class NPDAUserLogsListView(LoginAndOTPRequiredMixin, ListView):
     template_name = "npda_user_logs.html"
     model = VisitActivity
 
@@ -220,7 +221,7 @@ def form_valid(self, form):
         return super().form_valid(form)
 
 
-class RCPCHLoginView(TwoFactorLoginView):
+class RCPCHLoginView(TwoFactorLoginView, LoginAndOTPRequiredMixin):
     template_name = "two_factor/core/login.html"
 
     def __init__(self, **kwargs):
diff --git a/project/npda/views/patient.py b/project/npda/views/patient.py
index 2a97e7a0..d6735cf6 100644
--- a/project/npda/views/patient.py
+++ b/project/npda/views/patient.py
@@ -14,9 +14,10 @@
 # RCPCH imports
 from ..models import Patient
 from ..forms.patient_form import PatientForm
+from .mixins import LoginAndOTPRequiredMixin
 
 
-class PatientListView(LoginRequiredMixin, OTPRequiredMixin, ListView):
+class PatientListView(LoginAndOTPRequiredMixin, ListView):
     model = Patient
     template_name = "patients.html"
 
@@ -49,7 +50,7 @@ def get_context_data(self, **kwargs):
 
 
 class PatientCreateView(
-    LoginRequiredMixin, OTPRequiredMixin, SuccessMessageMixin, CreateView
+    LoginAndOTPRequiredMixin, SuccessMessageMixin, CreateView
 ):
     """
     Handle creation of new patient in audit
@@ -76,7 +77,7 @@ def form_valid(self, form: BaseForm) -> HttpResponse:
 
 
 class PatientUpdateView(
-    LoginRequiredMixin, OTPRequiredMixin, SuccessMessageMixin, UpdateView
+    LoginAndOTPRequiredMixin, SuccessMessageMixin, UpdateView
 ):
     """
     Handle update of patient in audit
@@ -103,7 +104,7 @@ def form_valid(self, form: BaseForm) -> HttpResponse:
 
 
 class PatientDeleteView(
-    LoginRequiredMixin, OTPRequiredMixin, SuccessMessageMixin, DeleteView
+    LoginAndOTPRequiredMixin, SuccessMessageMixin, DeleteView
 ):
     """
     Handle deletion of child from audit
diff --git a/project/npda/views/visit.py b/project/npda/views/visit.py
index 0cd5539a..c3b53011 100644
--- a/project/npda/views/visit.py
+++ b/project/npda/views/visit.py
@@ -16,11 +16,10 @@
 from ..models import Visit, Patient
 from ..forms.visit_form import VisitForm
 from ..general_functions import get_visit_categories
+from .mixins import LoginAndOTPRequiredMixin
 
 
-
-
-class PatientVisitsListView(LoginRequiredMixin, OTPRequiredMixin, ListView):
+class PatientVisitsListView(LoginAndOTPRequiredMixin, ListView):
     model = Visit
     template_name = "visits.html"
 
@@ -39,7 +38,7 @@ def get_context_data(self, **kwargs):
 
 
 class VisitCreateView(
-    LoginRequiredMixin, OTPRequiredMixin, SuccessMessageMixin, CreateView
+    LoginAndOTPRequiredMixin, SuccessMessageMixin, CreateView
 ):
     model = Visit
     form_class = VisitForm
@@ -73,7 +72,7 @@ def form_valid(self, form, **kwargs):
         return HttpResponseRedirect(self.get_success_url())
 
 
-class VisitUpdateView(LoginRequiredMixin, OTPRequiredMixin, UpdateView):
+class VisitUpdateView(LoginAndOTPRequiredMixin, UpdateView):
     model = Visit
     form_class = VisitForm
 
@@ -126,7 +125,7 @@ def form_valid(self, form: BaseModelForm) -> HttpResponse:
 
 
 class VisitDeleteView(
-    LoginRequiredMixin, OTPRequiredMixin, SuccessMessageMixin, DeleteView
+    LoginAndOTPRequiredMixin, SuccessMessageMixin, DeleteView
 ):
     model = Visit
     success_url = reverse_lazy("patient_visits")

From 7494c448f768f9c0431fa36a5ed034325960da54 Mon Sep 17 00:00:00 2001
From: anchit-chandran <anchit97123@gmail.com>
Date: Sat, 1 Jun 2024 11:49:11 +0100
Subject: [PATCH 12/14] loginAOTP

Signed-off-by: anchit-chandran <anchit97123@gmail.com>
---
 project/npda/views/npda_users.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/npda/views/npda_users.py b/project/npda/views/npda_users.py
index b9fb602d..9d3da575 100644
--- a/project/npda/views/npda_users.py
+++ b/project/npda/views/npda_users.py
@@ -221,7 +221,7 @@ def form_valid(self, form):
         return super().form_valid(form)
 
 
-class RCPCHLoginView(TwoFactorLoginView, LoginAndOTPRequiredMixin):
+class RCPCHLoginView(TwoFactorLoginView):
     template_name = "two_factor/core/login.html"
 
     def __init__(self, **kwargs):

From 6dff8324bfeefb0bff84f23cfd3bf6130ae25ad1 Mon Sep 17 00:00:00 2001
From: anchit-chandran <anchit97123@gmail.com>
Date: Sat, 1 Jun 2024 16:38:07 +0100
Subject: [PATCH 13/14] adds bypass 2fa in RCPCHLoginView POST method for when
 debug=True

Signed-off-by: anchit-chandran <anchit97123@gmail.com>
---
 project/npda/views/mixins.py     |  2 +-
 project/npda/views/npda_users.py | 40 +++++++++++++++++++++++++-------
 2 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/project/npda/views/mixins.py b/project/npda/views/mixins.py
index 865e2e6a..751e34d8 100644
--- a/project/npda/views/mixins.py
+++ b/project/npda/views/mixins.py
@@ -17,7 +17,7 @@ class LoginAndOTPRequiredMixin(AccessMixin):
     """
 
     def dispatch(self, request, *args, **kwargs):
-        logger.warning('inside MIXIN')
+        
         # Check if the user is authenticated
         if not request.user.is_authenticated:
             return self.handle_no_permission()
diff --git a/project/npda/views/npda_users.py b/project/npda/views/npda_users.py
index 9d3da575..4fe2f3d5 100644
--- a/project/npda/views/npda_users.py
+++ b/project/npda/views/npda_users.py
@@ -10,10 +10,12 @@
 from django.urls import reverse_lazy, reverse
 from django.contrib.messages.views import SuccessMessageMixin
 from django.contrib import messages
+from django.contrib.auth import login, authenticate
 from django.utils.html import strip_tags
 from django.conf import settings
 from two_factor.views import LoginView as TwoFactorLoginView
 
+
 from ..models import NPDAUser, VisitActivity
 from ..forms.npda_user_form import NPDAUserForm, CaptchaAuthenticationForm
 from ..general_functions import (
@@ -24,6 +26,9 @@
     group_for_role,
 )
 from .mixins import LoginAndOTPRequiredMixin
+from django.utils.decorators import method_decorator
+from .decorators import login_and_otp_required
+from django.contrib.auth.decorators import login_required
 
 logger = logging.getLogger(__name__)
 
@@ -39,9 +44,7 @@ def get_queryset(self):
         return NPDAUser.objects.all().order_by("surname")
 
 
-class NPDAUserCreateView(
-    LoginAndOTPRequiredMixin, SuccessMessageMixin, CreateView
-):
+class NPDAUserCreateView(LoginAndOTPRequiredMixin, SuccessMessageMixin, CreateView):
     """
     Handle creation of new patient in audit
     """
@@ -115,9 +118,7 @@ def get_success_url(self) -> str:
         )
 
 
-class NPDAUserUpdateView(
-    LoginAndOTPRequiredMixin, SuccessMessageMixin, UpdateView
-):
+class NPDAUserUpdateView(LoginAndOTPRequiredMixin, SuccessMessageMixin, UpdateView):
     """
     Handle update of patient in audit
     """
@@ -166,9 +167,7 @@ def post(self, request: HttpRequest, *args: str, **kwargs) -> HttpResponse:
             return super().post(request, *args, **kwargs)
 
 
-class NPDAUserDeleteView(
-    LoginAndOTPRequiredMixin, SuccessMessageMixin, DeleteView
-):
+class NPDAUserDeleteView(LoginAndOTPRequiredMixin, SuccessMessageMixin, DeleteView):
     """
     Handle deletion of child from audit
     """
@@ -229,6 +228,29 @@ def __init__(self, **kwargs):
         # Override original Django Auth Form with Captcha field inserted
         self.form_list["auth"] = CaptchaAuthenticationForm
 
+    def post(self, *args, **kwargs):
+        
+        # In local development, override the token workflow, just sign in 
+        # the user without 2FA token
+        if settings.DEBUG:
+            request = self.request
+
+            user = authenticate(
+                request,
+                username=request.POST.get("auth-username"),
+                password=request.POST.get("auth-password"),
+            )
+            if user is not None:
+                login(request, user)
+                return redirect('home')
+
+        # Otherwise, continue with usual workflow
+        response = super().post(*args, **kwargs)
+        return self.delete_cookies_from_response(response)
+        
+        
+        
+
     # Override successful login redirect to org summary page
     def done(self, form_list, **kwargs):
         response = super().done(form_list)

From 2475fa85a3e0e1648ecc8a0081f4b09ea33d1bfa Mon Sep 17 00:00:00 2001
From: eatyourpeas <simon@eatyourpeas.co.uk>
Date: Sat, 1 Jun 2024 23:37:30 +0100
Subject: [PATCH 14/14] remove requirement to be superuser to skip 2FA if DEBUG
 is true

---
 project/npda/views/decorators.py | 19 +++++++++++--------
 project/npda/views/npda_users.py |  9 +++------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/project/npda/views/decorators.py b/project/npda/views/decorators.py
index f6a7b0ef..18ddc0fb 100644
--- a/project/npda/views/decorators.py
+++ b/project/npda/views/decorators.py
@@ -8,6 +8,7 @@
 # Logging setup
 logger = logging.getLogger(__name__)
 
+
 def login_and_otp_required():
     """
     Must have verified via 2FA
@@ -16,17 +17,15 @@ def login_and_otp_required():
     def decorator(view):
         # First use login_required on decorator
         login_required(view)
-        
-        
 
         def wrapper(request, *args, **kwargs):
             # Then, ensure 2fa verified
             user = request.user
 
             # Bypass 2fa if local dev, with warning message
-            if settings.DEBUG and user.is_superuser:
+            if settings.DEBUG:
                 logger.warning(
-                    "User %s has bypassed 2FA for %s as settings.DEBUG is %s and user is superuser",
+                    "User %s has bypassed 2FA for %s as settings.DEBUG is %s",
                     user,
                     view,
                     settings.DEBUG,
@@ -36,12 +35,16 @@ def wrapper(request, *args, **kwargs):
             # Prevent unverified users
             if not user.is_verified():
                 user_list = user.__dict__
-                epilepsy12_user = user_list['_wrapped']
-                logger.info("User %s is unverified. Tried accessing %s", epilepsy12_user , view.__qualname__)
-                raise PermissionDenied('Unverified user')
+                epilepsy12_user = user_list["_wrapped"]
+                logger.info(
+                    "User %s is unverified. Tried accessing %s",
+                    epilepsy12_user,
+                    view.__qualname__,
+                )
+                raise PermissionDenied("Unverified user")
 
             return view(request, *args, **kwargs)
 
         return wrapper
 
-    return decorator
\ No newline at end of file
+    return decorator
diff --git a/project/npda/views/npda_users.py b/project/npda/views/npda_users.py
index 4fe2f3d5..577db338 100644
--- a/project/npda/views/npda_users.py
+++ b/project/npda/views/npda_users.py
@@ -229,8 +229,8 @@ def __init__(self, **kwargs):
         self.form_list["auth"] = CaptchaAuthenticationForm
 
     def post(self, *args, **kwargs):
-        
-        # In local development, override the token workflow, just sign in 
+
+        # In local development, override the token workflow, just sign in
         # the user without 2FA token
         if settings.DEBUG:
             request = self.request
@@ -242,14 +242,11 @@ def post(self, *args, **kwargs):
             )
             if user is not None:
                 login(request, user)
-                return redirect('home')
+                return redirect("home")
 
         # Otherwise, continue with usual workflow
         response = super().post(*args, **kwargs)
         return self.delete_cookies_from_response(response)
-        
-        
-        
 
     # Override successful login redirect to org summary page
     def done(self, form_list, **kwargs):