From 7bffe1160546076a0f3fa3b3a40e1fba594e1e74 Mon Sep 17 00:00:00 2001
From: A-Axisa <a3132688@adelaide.edu.au>
Date: Fri, 15 May 2026 22:00:46 +0930
Subject: [PATCH 001/105] fix: Remove max height from login form

---
 client/src/components/authentication/LoginForm.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client/src/components/authentication/LoginForm.js b/client/src/components/authentication/LoginForm.js
index 2cc8fc93..a92794a2 100644
--- a/client/src/components/authentication/LoginForm.js
+++ b/client/src/components/authentication/LoginForm.js
@@ -120,7 +120,6 @@ const LoginForm = () => {
           xl: "600px",
         },
         minHeight: "auto",
-        maxHeight: "400px",
         boxShadow: { xs: "none", sm: 16 },
       }}
     >

From 0c9ba75e7c756fb6940d7baf222fcb477490a29b Mon Sep 17 00:00:00 2001
From: A-Axisa <a3132688@adelaide.edu.au>
Date: Fri, 15 May 2026 22:19:17 +0930
Subject: [PATCH 002/105] Add marital and working status to patient model

---
 ...8b27_add_marital_and_working_status_to_.py | 34 +++++++++++++++++++
 server/models/dbmodels.py                     |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 server/alembic/versions/d89af5748b27_add_marital_and_working_status_to_.py

diff --git a/server/alembic/versions/d89af5748b27_add_marital_and_working_status_to_.py b/server/alembic/versions/d89af5748b27_add_marital_and_working_status_to_.py
new file mode 100644
index 00000000..1305ae4f
--- /dev/null
+++ b/server/alembic/versions/d89af5748b27_add_marital_and_working_status_to_.py
@@ -0,0 +1,34 @@
+"""Add marital and working status to patient
+
+Revision ID: d89af5748b27
+Revises: b1d8c21fe405
+Create Date: 2026-05-15 22:18:17.182065
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = 'd89af5748b27'
+down_revision: Union[str, Sequence[str], None] = 'b1d8c21fe405'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    """Upgrade schema."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('Patient', sa.Column('MaritalStatus', sa.Integer(), nullable=True))
+    op.add_column('Patient', sa.Column('WorkingStatus', sa.Integer(), nullable=True))
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    """Downgrade schema."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('Patient', 'WorkingStatus')
+    op.drop_column('Patient', 'MaritalStatus')
+    # ### end Alembic commands ###
diff --git a/server/models/dbmodels.py b/server/models/dbmodels.py
index f2b64627..1968fd6b 100644
--- a/server/models/dbmodels.py
+++ b/server/models/dbmodels.py
@@ -129,6 +129,8 @@ class Patient(Base):
     Weight = Column(Numeric(5, 2))
     Height = Column(Numeric(5, 2))
     DateOfBirth = Column(Date)
+    MaritalStatus = Column(Integer)
+    WorkingStatus = Column(Integer)
     CreatedAt = Column(DateTime, server_default=text('CURRENT_TIMESTAMP'))
 
     user = relationship("UserAccount", back_populates="patients")

From b48148c11e192285692b8fb754af7becd06b825f Mon Sep 17 00:00:00 2001
From: A-Axisa <a3132688@adelaide.edu.au>
Date: Sun, 17 May 2026 14:23:25 +0930
Subject: [PATCH 003/105] Return marital and working status with user
 information

---
 server/routers/users.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/server/routers/users.py b/server/routers/users.py
index 040ea2ed..d4c9597f 100644
--- a/server/routers/users.py
+++ b/server/routers/users.py
@@ -991,7 +991,9 @@ async def get_patient_data(request: Request, db_conn: Session = Depends(get_db))
         "weight": float(patient.Weight) if patient.Weight else None,
         "height": float(patient.Height) if patient.Height else None,
         "gender": get_gender(patient.Gender),
-        "age": get_age(patient.DateOfBirth)
+        "age": get_age(patient.DateOfBirth),
+        "maritalStatus": patient.get_marital_status_title(),
+        "workingStatus": patient.get_working_status_title(),
     }
 
     return result

From d8ed708bdd000b51a970b8e212e0355c20f1f4d5 Mon Sep 17 00:00:00 2001
From: A-Axisa <a3132688@adelaide.edu.au>
Date: Sun, 17 May 2026 14:25:27 +0930
Subject: [PATCH 004/105] Update marital and working status on report upload

---
 server/routers/health_prediction.py | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/server/routers/health_prediction.py b/server/routers/health_prediction.py
index 59b6e829..7abc622b 100644
--- a/server/routers/health_prediction.py
+++ b/server/routers/health_prediction.py
@@ -107,15 +107,30 @@ async def predict(data: HealthDataInput, request: Request, db_conn: Session = De
     # Update Weight & Height based on sanitized input.
     patient.Weight = sanitized_data["weight"]
     patient.Height = sanitized_data["height"]
+    patient.set_marital_status(sanitized_data["marital_status"])
+    patient.set_working_status(sanitized_data["working_status"])
 
     # Get the CSV patients's ID, otherwise uses the authenticated user's ID.
     patient_id = csv_patient_id if csv_patient_id is not None else patient.PatientID
-    healthData = HealthData(patient_id, sanitized_data["age"], sanitized_data["weight"], sanitized_data["height"], gender_map[sanitized_data["gender"]],
-                            sanitized_data["blood_glucose"], sanitized_data["ap_hi"], sanitized_data[
-                                "ap_lo"], sanitized_data["high_cholesterol"],
-                            sanitized_data["hypertension"], sanitized_data[
-                                "heart_disease"], sanitized_data["diabetes"], sanitized_data["alcohol"],
-                            smoker_map[sanitized_data["smoker"]],  marital_map[sanitized_data["marital_status"]], working_map[sanitized_data["working_status"]], sanitized_data["stroke"])
+    healthData = HealthData(
+        patient_id,
+        sanitized_data["age"],
+        sanitized_data["weight"],
+        sanitized_data["height"],
+        gender_map[sanitized_data["gender"]],
+        sanitized_data["blood_glucose"],
+        sanitized_data["ap_hi"],
+        sanitized_data["ap_lo"],
+        sanitized_data["high_cholesterol"],
+
+        sanitized_data["hypertension"],
+        sanitized_data["heart_disease"],
+        sanitized_data["diabetes"],
+        sanitized_data["alcohol"],
+        smoker_map[sanitized_data["smoker"]],
+        marital_map[sanitized_data["marital_status"]],
+        working_map[sanitized_data["working_status"]],
+        sanitized_data["stroke"])
 
     # Store health data into the database
     db_conn.add(healthData)

From 1183aa5212a4b536b1fa44ba58baad650b037104 Mon Sep 17 00:00:00 2001
From: A-Axisa <a3132688@adelaide.edu.au>
Date: Sun, 17 May 2026 14:26:43 +0930
Subject: [PATCH 005/105] Add marital and working status to patient model

---
 server/models/dbmodels.py | 43 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 41 insertions(+), 2 deletions(-)

diff --git a/server/models/dbmodels.py b/server/models/dbmodels.py
index 1968fd6b..af208d63 100644
--- a/server/models/dbmodels.py
+++ b/server/models/dbmodels.py
@@ -2,6 +2,14 @@
 from sqlalchemy.orm import declarative_base, relationship
 import enum
 
+MARITAL_STATUS_OPTIONS = ['Single', 'Married']
+WORKING_STATUS_OPTIONS = [
+    'Unemployed',
+    'Private',
+    'Student',
+    'Public',
+]
+
 Base = declarative_base()
 
 
@@ -129,15 +137,17 @@ class Patient(Base):
     Weight = Column(Numeric(5, 2))
     Height = Column(Numeric(5, 2))
     DateOfBirth = Column(Date)
+    CreatedAt = Column(DateTime, server_default=text('CURRENT_TIMESTAMP'))
     MaritalStatus = Column(Integer)
     WorkingStatus = Column(Integer)
-    CreatedAt = Column(DateTime, server_default=text('CURRENT_TIMESTAMP'))
 
     user = relationship("UserAccount", back_populates="patients")
     health_records = relationship("HealthData", back_populates="patient")
     user_access = relationship("UserPatientAccess", back_populates="patient")
 
-    def __init__(self, user_id, given_names, family_name, gender, weight, height, date_of_birth):
+    def __init__(self, user_id, given_names,
+                 family_name, gender, weight, height,
+                 date_of_birth, marital_status, working_status):
         self.UserID = user_id
         self.GivenNames = given_names
         self.FamilyName = family_name
@@ -145,12 +155,41 @@ def __init__(self, user_id, given_names, family_name, gender, weight, height, da
         self.Weight = weight
         self.Height = height
         self.DateOfBirth = date_of_birth
+        self.MaritalStatus = marital_status
+        self.WorkingStatus = working_status
 
     def __repr__(self):
         return f'Patient(PatientID={self.PatientID}, UserID={self.UserID}, givenNames={self.GivenNames}, \
         familyName={self.FamilyName}, gender={self.Gender}, weight={self.Weight}, height={self.Height}, \
         dateOfBirth={self.DateOfBirth}, Created={self.CreatedAt})'
 
+    def get_marital_status_id(self):
+        return self.MaritalStatus
+
+    def get_marital_status_title(self):
+        if (self.MaritalStatus is not None
+                and self.MaritalStatus < len(MARITAL_STATUS_OPTIONS)):
+            return MARITAL_STATUS_OPTIONS[self.MaritalStatus]
+        return None
+
+    def get_working_status_title(self):
+        if (self.WorkingStatus is not None
+                and self.WorkingStatus < len(WORKING_STATUS_OPTIONS)):
+            return WORKING_STATUS_OPTIONS[self.WorkingStatus]
+        return None
+
+    def set_marital_status(self, status: int | str):
+        if isinstance(status, str):
+            self.MaritalStatus = MARITAL_STATUS_OPTIONS.index(status)
+        else:
+            self.MaritalStatus = status
+
+    def set_working_status(self, status: int | str):
+        if isinstance(status, str):
+            self.WorkingStatus = WORKING_STATUS_OPTIONS.index(status)
+        else:
+            self.WorkingStatus = status
+
 
 class UserPatientAccess(Base):
     __tablename__ = 'UserPatientAccess'

From 2eef9f2cc7820c8bfe7f7f375aeb56931a9a71bc Mon Sep 17 00:00:00 2001
From: A-Axisa <a3132688@adelaide.edu.au>
Date: Sun, 17 May 2026 14:27:48 +0930
Subject: [PATCH 006/105] Update marital and working status on report form

---
 client/src/components/GenerateReportForm.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/client/src/components/GenerateReportForm.js b/client/src/components/GenerateReportForm.js
index abd69ee1..8b46aaa1 100644
--- a/client/src/components/GenerateReportForm.js
+++ b/client/src/components/GenerateReportForm.js
@@ -66,10 +66,10 @@ const GenerateReportForm = () => {
   const [alertApLowRequired, setAlertApLowRequired] = useState(false);
   const [apHigh, setApHigh] = useState(null);
   const [alertApHighRequired, setAlertApHighRequired] = useState(false);
-  const [maritalStatus, setMaritalStatus] = useState(null);
+  const [maritalStatus, setMaritalStatus] = useState("");
   const [alertMaritalStatusRequired, setAlertMaritalStatusRequired] =
     useState(false);
-  const [workingStatus, setWorkingStatus] = useState(null);
+  const [workingStatus, setWorkingStatus] = useState("");
   const [alertWorkingStatusRequired, setAlertWorkingStatusRequired] =
     useState(false);
   const [bloodGlucoseInput, setBloodGlucoseInput] = useState("");
@@ -92,6 +92,8 @@ const GenerateReportForm = () => {
         setHeight({ isValid: true, value: data.height });
         setGender(data.gender);
         setAge({ isValid: true, value: data.age });
+        setMaritalStatus(data.maritalStatus);
+        setWorkingStatus(data.workingStatus);
       } catch (err) {
         console.log("Failed to fetch patient data.");
       }

From 3d19fe0bde96abbca976abd5e1d6a0814350e762 Mon Sep 17 00:00:00 2001
From: A-Axisa <a3132688@adelaide.edu.au>
Date: Sun, 17 May 2026 17:09:00 +0930
Subject: [PATCH 007/105] Add docstring to model methods

---
 server/models/dbmodels.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/server/models/dbmodels.py b/server/models/dbmodels.py
index af208d63..0f42f46d 100644
--- a/server/models/dbmodels.py
+++ b/server/models/dbmodels.py
@@ -167,24 +167,30 @@ def get_marital_status_id(self):
         return self.MaritalStatus
 
     def get_marital_status_title(self):
+        """Returns marital status as a string."""
         if (self.MaritalStatus is not None
                 and self.MaritalStatus < len(MARITAL_STATUS_OPTIONS)):
             return MARITAL_STATUS_OPTIONS[self.MaritalStatus]
         return None
 
     def get_working_status_title(self):
+        """Returns working status as a string."""
         if (self.WorkingStatus is not None
                 and self.WorkingStatus < len(WORKING_STATUS_OPTIONS)):
             return WORKING_STATUS_OPTIONS[self.WorkingStatus]
         return None
 
     def set_marital_status(self, status: int | str):
+        """Sets the value of the marital status and will convert a string
+        to the matching integer."""
         if isinstance(status, str):
             self.MaritalStatus = MARITAL_STATUS_OPTIONS.index(status)
         else:
             self.MaritalStatus = status
 
     def set_working_status(self, status: int | str):
+        """Sets the value of the working status and will convert a string
+        to the matching integer."""
         if isinstance(status, str):
             self.WorkingStatus = WORKING_STATUS_OPTIONS.index(status)
         else:

From 65c6d225ac779e295f8aa2ab341066b0664621da Mon Sep 17 00:00:00 2001
From: Luke Bradley <bralc003@mymail.unisa.edu.au>
Date: Sun, 17 May 2026 18:28:01 +0930
Subject: [PATCH 008/105] Update create_patient to check for existing records

---
 server/routers/users.py | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/server/routers/users.py b/server/routers/users.py
index 040ea2ed..effedccc 100644
--- a/server/routers/users.py
+++ b/server/routers/users.py
@@ -9,6 +9,7 @@
 from sqlalchemy.orm import Session
 from html_sanitizer import Sanitizer
 import re
+from sqlalchemy import func
 
 from ..utils.database import get_db
 from ..utils.audit_log import write_audit_log
@@ -657,10 +658,30 @@ async def create_patient(patient: PatientCreationDetails, request: Request, db_c
         raise HTTPException(
             status_code=status.HTTP_422_UNPROCESSABLE_ENTITY)
 
+    # Sanitize name input and remove whitespace
+    sanitizer = Sanitizer()
+    sanitized_given_names = sanitizer.sanitize(patient.given_names).strip()
+    sanitized_family_name = sanitizer.sanitize(patient.family_name).strip()
+
+    # Check if the patient already exists
+    existing_patient = db_conn.query(Patient).filter(
+        func.lower(Patient.GivenNames) == sanitized_given_names.lower(),
+        func.lower(Patient.FamilyName) == sanitized_family_name.lower(),
+        Patient.DateOfBirth == patient.date_of_birth,
+        Patient.Gender == gender_map[patient.gender]
+    ).first()
+
+    if existing_patient:
+        raise HTTPException(
+            status_code=status.HTTP_409_CONFLICT,
+            detail="Patient already exists."
+        )
+
     # Create new patient
     new_patient = Patient(user_id=None,
-                          given_names=patient.given_names,
-                          family_name=patient.family_name, gender=gender_map[patient.gender],
+                          given_names=sanitized_given_names,
+                          family_name=sanitized_family_name,
+                          gender=gender_map[patient.gender],
                           date_of_birth=patient.date_of_birth,
                           weight=patient.weight,
                           height=patient.height)

From 8c2f1cee2c61fef3959a230f9a4422634b45a982 Mon Sep 17 00:00:00 2001
From: Luke Bradley <bralc003@mymail.unisa.edu.au>
Date: Sun, 17 May 2026 19:36:23 +0930
Subject: [PATCH 009/105] Implement test for checking duplicate patient
 creation

---
 server/tests/routers/test_users.py | 83 ++++++++++++++++++++++++++++--
 1 file changed, 80 insertions(+), 3 deletions(-)

diff --git a/server/tests/routers/test_users.py b/server/tests/routers/test_users.py
index 355b68da..089218e3 100644
--- a/server/tests/routers/test_users.py
+++ b/server/tests/routers/test_users.py
@@ -126,6 +126,19 @@ def setup_once_for_all_tests():
     db_conn.commit()
 
 
+# Removes patient record after a test
+@pytest.fixture
+def cleanup_patient():
+    db_conn = next(get_db())
+    created_ids = []
+    yield created_ids
+    for patient_id in created_ids:
+        db_conn.query(UserPatientAccess).filter(
+            UserPatientAccess.PatientID == patient_id).delete()
+        db_conn.query(Patient).filter(Patient.PatientID == patient_id).delete()
+        db_conn.commit()
+
+
 def test_delete_requires_authentication():
     fresh = TestClient(app)
     res = fresh.delete("/users/")
@@ -244,7 +257,7 @@ def test_merchant_cannot_access_other_patients():
     assert response.status_code == status.HTTP_404_NOT_FOUND
 
 
-def test_create_patient():
+def test_create_patient(cleanup_patient):
     # Login as Merchant
     credentials = {"email": "service@example.com",
                    "password": "thisismypassword"}
@@ -265,6 +278,7 @@ def test_create_patient():
     assert response.status_code == status.HTTP_200_OK
     assert response.json()["message"] == 'Patient successfully created.'
     assert isinstance(response.json()["patient_id"], int)
+    cleanup_patient.append(response.json()["patient_id"])
 
 
 def test_create_patient_non_merchant():
@@ -359,7 +373,7 @@ def test_create_patient_invalid_height():
     assert response.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY
 
 
-def test_remove_patient():
+def test_remove_patient(cleanup_patient):
     # Login as Merchant
     credentials = {"email": "service@example.com",
                    "password": "thisismypassword"}
@@ -368,7 +382,7 @@ def test_remove_patient():
     assert login_res.json() == {'message': f'Successfully logged in.'}
     # Patient Details
     patient = {
-        "given_names": "Timmy",
+        "given_names": "John",
         "family_name": "Smith",
         "date_of_birth": "1988-04-04",
         "gender": "Male",
@@ -380,6 +394,7 @@ def test_remove_patient():
     assert response.status_code == status.HTTP_200_OK
     assert response.json()["message"] == "Patient successfully created."
     assert isinstance(response.json()["patient_id"], int)
+    cleanup_patient.append(response.json()["patient_id"])
 
     response = client.delete(
         f"/remove-patient/{response.json()["patient_id"]}")
@@ -387,6 +402,68 @@ def test_remove_patient():
     assert response.json() == {'message': f'Patient successfully removed.'}
 
 
+def test_create_duplicate_patient(cleanup_patient):
+    # Login as Merchant
+    credentials = {"email": "service@example.com",
+                   "password": "thisismypassword"}
+    login_res = client.post("/login/", json=credentials)
+    assert login_res.status_code == status.HTTP_200_OK
+    assert login_res.json() == {'message': f'Successfully logged in.'}
+    # Patient Details
+    patient = {
+        "given_names": "Timmy",
+        "family_name": "Smith",
+        "date_of_birth": "1988-04-04",
+        "gender": "Male",
+        "weight": 80,
+        "height": 180
+    }
+    # Create Patient
+    response = client.post("/create-patient", json=patient)
+    assert response.status_code == status.HTTP_200_OK
+    assert isinstance(response.json()["patient_id"], int)
+    cleanup_patient.append(response.json()["patient_id"])
+
+    # Attempt to create the patient record again
+    response = client.post("/create-patient", json=patient)
+    assert response.status_code == status.HTTP_409_CONFLICT
+
+
+def test_create_duplicate_patient_whitespace(cleanup_patient):
+    # Login as Merchant
+    credentials = {"email": "service@example.com",
+                   "password": "thisismypassword"}
+    login_res = client.post("/login/", json=credentials)
+    assert login_res.status_code == status.HTTP_200_OK
+    assert login_res.json() == {'message': f'Successfully logged in.'}
+    # Patient Details
+    patient = {
+        "given_names": "Timmy",
+        "family_name": "Smith",
+        "date_of_birth": "1988-04-04",
+        "gender": "Male",
+        "weight": 80,
+        "height": 180
+    }
+    whitespace_patient = {
+        "given_names": "  Timmy",
+        "family_name": "  Smith",
+        "date_of_birth": "1988-04-04",
+        "gender": "Male",
+        "weight": 80,
+        "height": 180
+    }
+    # Create Patient
+    response = client.post("/create-patient", json=patient)
+    assert response.status_code == status.HTTP_200_OK
+    assert isinstance(response.json()["patient_id"], int)
+    cleanup_patient.append(response.json()["patient_id"])
+
+    # Attempt to create the patient record again using the same patient names with whitespace
+    response = client.post("/create-patient", json=whitespace_patient)
+    assert response.status_code == status.HTTP_409_CONFLICT
+
+
 class TestPatientAccessRequestFlow():
     def test_successful_request(self):
 

From e905b549861dec6f95feed07d4a13261c89cb32e Mon Sep 17 00:00:00 2001
From: Luke Bradley <bralc003@mymail.unisa.edu.au>
Date: Sun, 17 May 2026 19:45:12 +0930
Subject: [PATCH 010/105] Fix create patient form always return success

---
 client/src/components/authentication/CreatePatientForm.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/src/components/authentication/CreatePatientForm.js b/client/src/components/authentication/CreatePatientForm.js
index d5c9473a..cfb31db7 100644
--- a/client/src/components/authentication/CreatePatientForm.js
+++ b/client/src/components/authentication/CreatePatientForm.js
@@ -168,12 +168,12 @@ const CreatePatientForm = () => {
       .then((response) => {
         if (!response.ok) {
           setShowFailMessage(true);
+          setShowSuccessMessage(false);
+          return
         }
-        return response.json();
-      })
-      .then((data) => {
         setShowSuccessMessage(true);
         setShowFailMessage(false);
+        return response.json();
       })
       .catch((err) => {
         console.log("An error has occurred");

From 8fc3312cf559bcbcea888fe9d4448b27d17b716c Mon Sep 17 00:00:00 2001
From: A-Axisa <a3132688@adelaide.edu.au>
Date: Sun, 17 May 2026 20:12:08 +0930
Subject: [PATCH 011/105] Change status types to dictionaries

---
 server/models/dbmodels.py | 41 ++++++++++++++++++---------------------
 1 file changed, 19 insertions(+), 22 deletions(-)

diff --git a/server/models/dbmodels.py b/server/models/dbmodels.py
index 0f42f46d..668a3aeb 100644
--- a/server/models/dbmodels.py
+++ b/server/models/dbmodels.py
@@ -2,13 +2,17 @@
 from sqlalchemy.orm import declarative_base, relationship
 import enum
 
-MARITAL_STATUS_OPTIONS = ['Single', 'Married']
-WORKING_STATUS_OPTIONS = [
-    'Unemployed',
-    'Private',
-    'Student',
-    'Public',
-]
+MARITAL_STATUS_OPTIONS = {
+    0: 'Single',
+    1: 'Married',
+}
+
+WORKING_STATUS_OPTIONS = {
+    0: 'Unemployed',
+    1: 'Private',
+    2: 'Student',
+    3: 'Public',
+}
 
 Base = declarative_base()
 
@@ -163,28 +167,20 @@ def __repr__(self):
         familyName={self.FamilyName}, gender={self.Gender}, weight={self.Weight}, height={self.Height}, \
         dateOfBirth={self.DateOfBirth}, Created={self.CreatedAt})'
 
-    def get_marital_status_id(self):
-        return self.MaritalStatus
-
-    def get_marital_status_title(self):
+    def get_marital_status(self):
         """Returns marital status as a string."""
-        if (self.MaritalStatus is not None
-                and self.MaritalStatus < len(MARITAL_STATUS_OPTIONS)):
-            return MARITAL_STATUS_OPTIONS[self.MaritalStatus]
-        return None
+        return MARITAL_STATUS_OPTIONS.get(self.MaritalStatus)
 
-    def get_working_status_title(self):
+    def get_working_status(self):
         """Returns working status as a string."""
-        if (self.WorkingStatus is not None
-                and self.WorkingStatus < len(WORKING_STATUS_OPTIONS)):
-            return WORKING_STATUS_OPTIONS[self.WorkingStatus]
-        return None
+        return WORKING_STATUS_OPTIONS.get(self.WorkingStatus)
 
     def set_marital_status(self, status: int | str):
         """Sets the value of the marital status and will convert a string
         to the matching integer."""
         if isinstance(status, str):
-            self.MaritalStatus = MARITAL_STATUS_OPTIONS.index(status)
+            self.MaritalStatus = next(
+                (k for k, v in MARITAL_STATUS_OPTIONS.items() if v == status), None)
         else:
             self.MaritalStatus = status
 
@@ -192,7 +188,8 @@ def set_working_status(self, status: int | str):
         """Sets the value of the working status and will convert a string
         to the matching integer."""
         if isinstance(status, str):
-            self.WorkingStatus = WORKING_STATUS_OPTIONS.index(status)
+            self.WorkingStatus = next(
+                (k for k, v in WORKING_STATUS_OPTIONS.items() if v == status), None)
         else:
             self.WorkingStatus = status
 

From cc2e76bcbc2f2e38740ea47c7e52d93cbf66961e Mon Sep 17 00:00:00 2001
From: A-Axisa <a3132688@adelaide.edu.au>
Date: Sun, 17 May 2026 20:12:59 +0930
Subject: [PATCH 012/105] Return marital and working status for merchant
 patients

---
 server/routers/users.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/server/routers/users.py b/server/routers/users.py
index d4c9597f..43e1cde7 100644
--- a/server/routers/users.py
+++ b/server/routers/users.py
@@ -992,8 +992,8 @@ async def get_patient_data(request: Request, db_conn: Session = Depends(get_db))
         "height": float(patient.Height) if patient.Height else None,
         "gender": get_gender(patient.Gender),
         "age": get_age(patient.DateOfBirth),
-        "maritalStatus": patient.get_marital_status_title(),
-        "workingStatus": patient.get_working_status_title(),
+        "maritalStatus": patient.get_marital_status(),
+        "workingStatus": patient.get_working_status(),
     }
 
     return result
@@ -1031,7 +1031,9 @@ async def get_merchant_patient_data(patient_id: int, request: Request, db_conn:
         "weight": float(patient.Weight) if patient.Weight else None,
         "height": float(patient.Height) if patient.Height else None,
         "gender": get_gender(patient.Gender),
-        "age": get_age(patient.DateOfBirth)
+        "age": get_age(patient.DateOfBirth),
+        "maritalStatus": patient.get_marital_status(),
+        "workingStatus": patient.get_working_status(),
     }
 
     return result

From 6c1902b3b3a2e7e4b264c83c0fabec03950bcf80 Mon Sep 17 00:00:00 2001
From: A-Axisa <a3132688@adelaide.edu.au>
Date: Sun, 17 May 2026 20:13:42 +0930
Subject: [PATCH 013/105] Update marital and working status for merchant
 reports

---
 client/src/components/MerchantReportForm.js | 6 ++++--
 server/routers/health_prediction.py         | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/client/src/components/MerchantReportForm.js b/client/src/components/MerchantReportForm.js
index f34fdfcd..94c62652 100644
--- a/client/src/components/MerchantReportForm.js
+++ b/client/src/components/MerchantReportForm.js
@@ -82,10 +82,10 @@ const MerchantReportForm = () => {
   const [alertApLowRequired, setAlertApLowRequired] = useState(false);
   const [apHigh, setApHigh] = useState(null);
   const [alertApHighRequired, setAlertApHighRequired] = useState(false);
-  const [maritalStatus, setMaritalStatus] = useState(null);
+  const [maritalStatus, setMaritalStatus] = useState("");
   const [alertMaritalStatusRequired, setAlertMaritalStatusRequired] =
     useState(false);
-  const [workingStatus, setWorkingStatus] = useState(null);
+  const [workingStatus, setWorkingStatus] = useState("");
   const [alertWorkingStatusRequired, setAlertWorkingStatusRequired] =
     useState(false);
   const [alertPatientRequired, setAlertPatientRequired] = useState(false);
@@ -142,6 +142,8 @@ const MerchantReportForm = () => {
         setHeight({ isValid: true, value: data.height });
         setGender(data.gender);
         setAge({ isValid: true, value: data.age });
+        setMaritalStatus(data.maritalStatus);
+        setWorkingStatus(data.workingStatus);
       } catch (err) {
         console.log("Failed to fetch patient data.");
       }
diff --git a/server/routers/health_prediction.py b/server/routers/health_prediction.py
index 7abc622b..4f9cfc80 100644
--- a/server/routers/health_prediction.py
+++ b/server/routers/health_prediction.py
@@ -392,6 +392,8 @@ async def merchant_predict(data: MerchantHealthDataInput, request: Request, db_c
     # Update Weight & Height based on sanitized input.
     patient.Weight = sanitized_data["weight"]
     patient.Height = sanitized_data["height"]
+    patient.set_marital_status(sanitized_data["marital_status"])
+    patient.set_working_status(sanitized_data["working_status"])
 
     # Check if the merchant has permission to view the patients record
     if (merchant_view_patient(merchant.UserID, patient.PatientID, db_conn) == False):

From 2e2a6f6523d6f60da4664740f3f0370f7edcaaf6 Mon Sep 17 00:00:00 2001
From: A-Axisa <a3132688@adelaide.edu.au>
Date: Sun, 17 May 2026 20:37:56 +0930
Subject: [PATCH 014/105] Give marital and work status default values

---
 server/models/dbmodels.py | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/server/models/dbmodels.py b/server/models/dbmodels.py
index 668a3aeb..38fe314d 100644
--- a/server/models/dbmodels.py
+++ b/server/models/dbmodels.py
@@ -149,9 +149,18 @@ class Patient(Base):
     health_records = relationship("HealthData", back_populates="patient")
     user_access = relationship("UserPatientAccess", back_populates="patient")
 
-    def __init__(self, user_id, given_names,
-                 family_name, gender, weight, height,
-                 date_of_birth, marital_status, working_status):
+    def __init__(
+            self,
+            user_id,
+            given_names,
+            family_name,
+            gender,
+            weight,
+            height,
+            date_of_birth,
+            marital_status=None,
+            working_status=None
+    ):
         self.UserID = user_id
         self.GivenNames = given_names
         self.FamilyName = family_name

From c35552649c1d5aead135442146736d64168e667e Mon Sep 17 00:00:00 2001
From: A-Axisa <a3132688@adelaide.edu.au>
Date: Sun, 17 May 2026 20:38:31 +0930
Subject: [PATCH 015/105] test: Fix tests checking patient keys

---
 server/tests/routers/test_users.py | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/server/tests/routers/test_users.py b/server/tests/routers/test_users.py
index 355b68da..aa7f76ea 100644
--- a/server/tests/routers/test_users.py
+++ b/server/tests/routers/test_users.py
@@ -189,7 +189,14 @@ def test_get_patient_data_returns_correct_fields():
     data = response.json()
 
     assert response.status_code == status.HTTP_200_OK
-    assert data.keys() == {"weight", "height", "gender", "age"}
+    assert data.keys() == {
+        "workingStatus",
+        "maritalStatus",
+        "weight",
+        "height",
+        "gender",
+        "age"
+    }
     assert data["gender"] == "Male"
     assert data["age"] == datetime.today().year - 1980 - \
         ((datetime.today().month, datetime.today().day) < (5, 24))
@@ -227,7 +234,14 @@ def test_merchant_get_patient_data_returns_correct_fields():
     data = response.json()
 
     assert response.status_code == status.HTTP_200_OK
-    assert data.keys() == {"weight", "height", "gender", "age"}
+    assert data.keys() == {
+        "workingStatus",
+        "maritalStatus",
+        "weight",
+        "height",
+        "gender",
+        "age"
+    }
     assert data["gender"] == "Male"
     assert data["age"] == datetime.today().year - 1980 - \
         ((datetime.today().month, datetime.today().day) < (5, 24))

From 80402a4f2a125b7d512370ae19643e256a8c1e31 Mon Sep 17 00:00:00 2001
From: wyl2003 <108109393+wyl2003@users.noreply.github.com>
Date: Sun, 17 May 2026 22:49:59 +0930
Subject: [PATCH 016/105] remove some text and tab in setting

---
 client/src/routes/UserSettings.js | 140 +-----------------------------
 1 file changed, 1 insertion(+), 139 deletions(-)

diff --git a/client/src/routes/UserSettings.js b/client/src/routes/UserSettings.js
index e69a95b0..753b7655 100644
--- a/client/src/routes/UserSettings.js
+++ b/client/src/routes/UserSettings.js
@@ -6,10 +6,7 @@ import {
   ListItem,
   ListItemText,
   TextField,
-  Divider,
   Button,
-  Switch,
-  FormControlLabel,
   FormControl,
   InputLabel,
   Select,
@@ -59,16 +56,6 @@ const UserSettings = () => {
 
   const [passwordChanged, setPasswordChanged] = useState(false);
 
-  // Notification state
-  const [notifications, setNotifications] = useState({
-    emailNotifications: true,
-    smsNotifications: false,
-    pushNotifications: true,
-    healthReminders: true,
-    reportUpdates: true,
-    systemAlerts: false,
-  });
-
   const [saveMessage, setSaveMessage] = useState("");
   const [saveError, setSaveError] = useState("");
   const [profileErrors, setProfileErrors] = useState({});
@@ -161,12 +148,6 @@ const UserSettings = () => {
 
   const updateForm = (k, v) => setFormData((p) => ({ ...p, [k]: v }));
   const updatePwd = (k, v) => setPasswordData((p) => ({ ...p, [k]: v }));
-  const updateNotify = (k, v) => setNotifications((p) => ({ ...p, [k]: v }));
-
-  const handleSave = (section) => {
-    setSaveMessage(`${section} saved successfully!`);
-    setTimeout(() => setSaveMessage(""), 2500);
-  };
 
   const validateProfile = () => {
     const errors = {};
@@ -324,13 +305,6 @@ const UserSettings = () => {
               flexWrap: "wrap",
             }}
           >
-            <Typography
-              variant="subtitle1"
-              color="error"
-              sx={{ fontWeight: 600 }}
-            >
-              Danger Zone
-            </Typography>
             <Button
               variant="contained"
               color="error"
@@ -594,115 +568,6 @@ const UserSettings = () => {
     );
   };
 
-  const Notifications = () => (
-    <Box>
-      <Typography
-        variant="h5"
-        sx={{ mb: 3, color: "primary.main", fontWeight: 600 }}
-      >
-        Notification Settings
-      </Typography>
-      {saveMessage && (
-        <Alert severity="success" sx={{ mb: 2 }}>
-          {saveMessage}
-        </Alert>
-      )}
-
-      <Stack spacing={1.5}>
-        <FormControlLabel
-          control={
-            <Switch
-              checked={notifications.emailNotifications}
-              onChange={(e) =>
-                updateNotify("emailNotifications", e.target.checked)
-              }
-            />
-          }
-          label="Email Notifications"
-        />
-        <Typography variant="body2" color="text.secondary" sx={{ ml: 4 }}>
-          Receive reminders and updates via email
-        </Typography>
-
-        <FormControlLabel
-          control={
-            <Switch
-              checked={notifications.pushNotifications}
-              onChange={(e) =>
-                updateNotify("pushNotifications", e.target.checked)
-              }
-            />
-          }
-          label="Push Notifications"
-        />
-        <Typography variant="body2" color="text.secondary" sx={{ ml: 4 }}>
-          Get instant notifications on your device
-        </Typography>
-
-        <FormControlLabel
-          control={
-            <Switch
-              checked={notifications.smsNotifications}
-              onChange={(e) =>
-                updateNotify("smsNotifications", e.target.checked)
-              }
-            />
-          }
-          label="SMS Notifications"
-        />
-        <Typography variant="body2" color="text.secondary" sx={{ ml: 4 }}>
-          Receive important health alerts via SMS
-        </Typography>
-
-        <Divider sx={{ my: 2 }} />
-        <FormControlLabel
-          control={
-            <Switch
-              checked={notifications.healthReminders}
-              onChange={(e) =>
-                updateNotify("healthReminders", e.target.checked)
-              }
-            />
-          }
-          label="Health Reminders"
-        />
-        <FormControlLabel
-          control={
-            <Switch
-              checked={notifications.reportUpdates}
-              onChange={(e) => updateNotify("reportUpdates", e.target.checked)}
-            />
-          }
-          label="Report Updates"
-        />
-        <FormControlLabel
-          control={
-            <Switch
-              checked={notifications.systemAlerts}
-              onChange={(e) => updateNotify("systemAlerts", e.target.checked)}
-            />
-          }
-          label="System Alerts"
-        />
-
-        <Box sx={{ display: "flex", justifyContent: "flex-end", mt: 1 }}>
-          <Button
-            variant="contained"
-            onClick={() => handleSave("Notifications")}
-            sx={{
-              px: 4,
-              py: { xs: "0.8rem", sm: "0.6rem" },
-              fontSize: { xs: "1rem", sm: "0.875rem" },
-              fontWeight: 500,
-            }}
-          >
-            Save Preferences
-          </Button>
-        </Box>
-      </Stack>
-    </Box>
-  );
-
   const handleTabChange = (event, newValue) => {
     setSelectedSection(newValue);
   };
@@ -715,8 +580,6 @@ const UserSettings = () => {
         return Profile();
       case "Password":
         return Password();
-      case "Notifications":
-        return Notifications();
       default:
         return null;
     }
@@ -758,7 +621,6 @@ const UserSettings = () => {
             <Tab label="Account Details" value="Account Details" />
             <Tab label="Profile" value="Profile" />
             <Tab label="Password" value="Password" />
-            <Tab label="Notifications" value="Notifications" />
           </Tabs>
         </Box>
       ) : (
@@ -776,7 +638,7 @@ const UserSettings = () => {
             </Typography>
           </Box>
           <List component="nav" sx={{ p: 0 }}>
-            {["Account Details", "Profile", "Password", "Notifications"].map(
+            {["Account Details", "Profile", "Password"].map(
               (item) => (
                 <ListItem
                   key={item}

From 69cad9027d6b6f32b6043df38329693d4962ead9 Mon Sep 17 00:00:00 2001
From: wyl2003 <108109393+wyl2003@users.noreply.github.com>
Date: Sun, 17 May 2026 23:01:27 +0930
Subject: [PATCH 017/105] fix: user dashboard percentage card displaying newest

---
 client/src/routes/UserLanding.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/routes/UserLanding.js b/client/src/routes/UserLanding.js
index 82c2ae87..8e0d0fef 100644
--- a/client/src/routes/UserLanding.js
+++ b/client/src/routes/UserLanding.js
@@ -157,7 +157,7 @@ const UserLanding = ({}) => {
                       lineHeight: 1.2,
                     }}
                   >
-                    {data?.risks?.[key]?.slice(-1)[0] ?? 0}%
+                    {data?.risks?.[key]?.[0] ?? 0}%
                   </Typography>
                   <Box
                     component="span"

From 9f92049a59bc03b894e8bb38967aedd84288453c Mon Sep 17 00:00:00 2001
From: wyl2003 <108109393+wyl2003@users.noreply.github.com>
Date: Sun, 17 May 2026 23:05:03 +0930
Subject: [PATCH 018/105] fix: display last data in Patient Details page

---
 client/src/routes/PatientDetails.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/routes/PatientDetails.js b/client/src/routes/PatientDetails.js
index d56ca32d..b6b99d1e 100644
--- a/client/src/routes/PatientDetails.js
+++ b/client/src/routes/PatientDetails.js
@@ -218,7 +218,7 @@ const PatientDetails = () => {
                     {key.toUpperCase()}
                   </Typography>
                   <Typography sx={{ fontSize: { xs: "1.4rem", sm: "2.125rem" }, fontWeight: 400, lineHeight: 1.2 }}>
-                    {patientData?.risks?.[key]?.slice(-1)[0] ?? 0}%
+                    {patientData?.risks?.[key]?.[0] ?? 0}%
                   </Typography>
                   <Box
                     component="span"

From 1cdcd40b4739cccf9a2e4243f6f8a780261b9944 Mon Sep 17 00:00:00 2001
From: wyl2003 <108109393+wyl2003@users.noreply.github.com>
Date: Sun, 17 May 2026 23:30:31 +0930
Subject: [PATCH 019/105] Add authentication to the backend API for changing
 user roles Log unauthorized user role change attempts Prevent administrators
 from changing their own roles to avoid losing access privileges

---
 server/routers/admin.py | 39 ++++++++++++++++++++++++++++++++-------
 1 file changed, 32 insertions(+), 7 deletions(-)

diff --git a/server/routers/admin.py b/server/routers/admin.py
index 76396b3e..67412aa1 100644
--- a/server/routers/admin.py
+++ b/server/routers/admin.py
@@ -189,6 +189,32 @@ async def get_users(
 async def update_user_role(user_email: str, role_id: int, request: Request,
                            db_conn: Session = Depends(get_db)):
     """Update a user's role"""
+    # Authenticate the requesting user.
+    current_user_data = get_current_user(request, db_conn)
+    requesting_user_email = current_user_data.get('email')
+
+    # Verify the requesting user is an administrator.
+    admin_user = db_conn.query(UserAccount).filter(
+        UserAccount.Email == requesting_user_email).first()
+    if not admin_user:
+        raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED,
+                            detail="Could not identify the requesting user.")
+
+    admin_role = db_conn.query(AccountRole).join(
+        UserAccountRole, AccountRole.RoleID == UserAccountRole.RoleID
+    ).filter(UserAccountRole.UserID == admin_user.UserID).first()
+
+    if not admin_role or admin_role.RoleName.lower() != 'admin':
+        write_audit_log(db_conn,
+                        eventType=LogEventType.ROLE_CHANGED,
+                        success=False,
+                        userEmail=requesting_user_email,
+                        device=request.headers.get("user-agent"),
+                        ipAddress=request.client.host,
+                        description=f"Unauthorized role change attempt for account: {user_email}.")
+        raise HTTPException(status_code=status.HTTP_403_FORBIDDEN,
+                            detail="You do not have permission to change user roles.")
+
     # Check if both the user and role exist.
     user = db_conn.query(UserAccount).filter(
         UserAccount.Email == user_email).first()
@@ -196,6 +222,11 @@ async def update_user_role(user_email: str, role_id: int, request: Request,
         raise HTTPException(
             status_code=status.HTTP_404_NOT_FOUND, detail="User not found.")
 
+    # Prevent admin from changing their own role.
+    if admin_user.UserID == user.UserID:
+        raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST,
+                            detail="Administrators cannot change their own role.")
+
     role = db_conn.query(AccountRole).filter(
         AccountRole.RoleID == role_id).first()
     if not role:
@@ -214,16 +245,10 @@ async def update_user_role(user_email: str, role_id: int, request: Request,
 
     db_conn.commit()
 
-    actor_email = None
-    try:  # After resolving the authentication issue for this endpoint, this exception handling should be removed
-        actor_email = get_current_user(request, db_conn).get('email')
-    except Exception:
-        pass
-
     write_audit_log(db_conn,
                     eventType=LogEventType.ROLE_CHANGED,
                     success=True,
-                    userEmail=actor_email,
+                    userEmail=requesting_user_email,
                     device=request.headers.get("user-agent"),
                     ipAddress=request.client.host,
                     description=f"Role changed for {user_email} to {role.RoleName}.")

From b009aabc5a19f89b91e578aec29dc3ca9218080c Mon Sep 17 00:00:00 2001
From: wyl2003 <108109393+wyl2003@users.noreply.github.com>
Date: Mon, 18 May 2026 00:53:53 +0930
Subject: [PATCH 020/105] fix: role change frontend add include credentials

---
 client/src/components/administrator/UserManagementTable.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/src/components/administrator/UserManagementTable.js b/client/src/components/administrator/UserManagementTable.js
index ca06daca..d3c72852 100644
--- a/client/src/components/administrator/UserManagementTable.js
+++ b/client/src/components/administrator/UserManagementTable.js
@@ -130,6 +130,7 @@ const UserManagementTable = () => {
             {
               method: "PATCH",
               headers: { "Content-Type": "application/json" },
+              credentials: "include",
             },
           );
           if (!response.ok) throw new Error(response.status);

From 6f437bc6327dc545f1ed4076554cb630786c0fd0 Mon Sep 17 00:00:00 2001
From: wyl2003 <108109393+wyl2003@users.noreply.github.com>
Date: Mon, 18 May 2026 23:56:47 +0930
Subject: [PATCH 021/105] Remove FALLBACK text from prediction text

---
 server/services/health_recommendation_service.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/services/health_recommendation_service.py b/server/services/health_recommendation_service.py
index c67afb1d..8c0b1041 100644
--- a/server/services/health_recommendation_service.py
+++ b/server/services/health_recommendation_service.py
@@ -172,7 +172,7 @@ def _fallback_recommendations(ctx: Dict):
     if "high cholesterol" in conditions:
         diet += "Increase soluble fiber (oats, legumes) and healthy fats (olive oil, nuts); reduce saturated fats. "
 
-    lifestyle = "[FALLBACK] Sleep 7–9 hours nightly, manage stress with short daily breathing or mindfulness. Hydrate adequately. "
+    lifestyle = "Sleep 7–9 hours nightly, manage stress with short daily breathing or mindfulness. Hydrate adequately. "
     if "smoking" in conditions:
         lifestyle += "Begin a smoking cessation plan (nicotine replacement or counseling). "
     if "alcohol use" in conditions:

From 9adcd6429c7d2d7e9f27f132e0e7a5614ed4efa3 Mon Sep 17 00:00:00 2001
From: wyl2003 <108109393+wyl2003@users.noreply.github.com>
Date: Tue, 19 May 2026 01:03:19 +0930
Subject: [PATCH 022/105] doc: add docstring for health_prediction.py

---
 server/routers/health_prediction.py | 42 ++++++++++++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

diff --git a/server/routers/health_prediction.py b/server/routers/health_prediction.py
index 4f9cfc80..c869c577 100644
--- a/server/routers/health_prediction.py
+++ b/server/routers/health_prediction.py
@@ -76,6 +76,16 @@ class MerchantHealthDataInput(CamelModel):
 
 
 def build_model_input_df(model, values):
+    """
+    Construct a single-row pandas DataFrame from model features and input values.
+
+    Uses the model's ``feature_names_in_`` attribute as column headers when available,
+    falling back to a positional layout if the attribute is absent.
+
+    :param model: A fitted scikit-learn model (expected to expose ``feature_names_in_``).
+    :param values: A list of numeric values corresponding to the model's feature set.
+    :return: A pandas DataFrame with one row suitable for ``model.predict_proba()``.
+    """
     feature_names = getattr(model, "feature_names_in_", None)
     if feature_names is not None and len(feature_names) == len(values):
         return pd.DataFrame([values], columns=list(feature_names))
@@ -85,7 +95,21 @@ def build_model_input_df(model, values):
 @router.post("/health-prediction/")
 async def predict(data: HealthDataInput, request: Request, db_conn: Session = Depends(get_db),
                   csv_patient_id: Optional[int] = None):
-
+    """
+    Generate cardio, stroke, and diabetes risk predictions for the authenticated user.
+
+    Accepts health metrics via ``HealthDataInput``, sanitises and validates the data,
+    calculates BMI, runs three ML prediction models, persists health data and predictions
+    to the database, and generates AI-powered health recommendations (best-effort).
+
+    :param data: Health metrics including vitals, lifestyle choices, and medical history.
+    :param request: The HTTP request object (used for audit logging and user extraction).
+    :param db_conn: Database session provided by the FastAPI dependency.
+    :param csv_patient_id: Optional patient ID forwarded from CSV bulk upload flow.
+    :return: JSON with ``cardioProbability``, ``strokeProbability``, ``diabetesProbability``,
+             and a ``recommendations`` block.
+    :raises HTTPException 422: If sanitised health data fails validation.
+    """
     # Sanitize and normalize health data
     sanitized_data = sanitize_health_data(data)
 
@@ -541,66 +565,82 @@ async def merchant_predict(data: MerchantHealthDataInput, request: Request, db_c
 
 
 def is_age_valid(age: int):
+    """Check whether ``age`` falls within the valid physiological range (0–100)."""
     return age >= 0 and age <= 100
 
 
 def is_weight_valid(weight: float):
+    """Check whether ``weight`` (kg) falls within the valid range (0.0–200.0)."""
     return weight >= 0.0 and weight <= 200.0
 
 
 def is_height_valid(height: float):
+    """Check whether ``height`` (cm) falls within the valid range (0.0–300.0)."""
     return height >= 0.0 and height <= 300
 
 
 def is_gender_valid(gender: int):
+    """Check whether ``gender`` is present in the predefined mapping."""
     return gender in gender_map
 
 
 def is_blood_glucose_valid(blood_glucose: float):
+    """Check whether ``blood_glucose`` (mmol/L) falls within the valid range (0.0–20.0)."""
     return blood_glucose >= 0.0 and blood_glucose <= 20.0
 
 
 def is_ap_hi_valid(ap_hi: float):
+    """Check whether systolic blood pressure ``ap_hi`` (mmHg) is valid (0.0–200.0)."""
     return ap_hi >= 0.0 and ap_hi <= 200.0
 
 
 def is_ap_lo_valid(ap_lo: float):
+    """Check whether diastolic blood pressure ``ap_lo`` (mmHg) is valid (0.0–200.0)."""
     return ap_lo >= 0.0 and ap_lo <= 200.0
 
 
 def is_high_cholesterol_valid(high_cholesterol: int):
+    """Check whether ``high_cholesterol`` is a binary flag (0 or 1)."""
     return high_cholesterol == 0 or high_cholesterol == 1
 
 
 def is_hyper_tension_valid(hypertension: int):
+    """Check whether ``hypertension`` is a binary flag (0 or 1)."""
     return hypertension == 0 or hypertension == 1
 
 
 def is_heart_disease_valid(heart_disease: int):
+    """Check whether ``heart_disease`` is a binary flag (0 or 1)."""
     return heart_disease == 0 or heart_disease == 1
 
 
 def is_diabetes_valid(diabetes: int):
+    """Check whether ``diabetes`` is a binary flag (0 or 1)."""
     return diabetes == 0 or diabetes == 1
 
 
 def is_alcohol_valid(alcohol: int):
+    """Check whether ``alcohol`` is a binary flag (0 or 1)."""
     return alcohol == 0 or alcohol == 1
 
 
 def is_smoker_valid(smoker: str):
+    """Check whether ``smoker`` is present in the predefined smoking-status mapping."""
     return smoker in smoker_map
 
 
 def is_marital_status_valid(marital_status: str):
+    """Check whether ``marital_status`` is present in the predefined mapping."""
     return marital_status in marital_map
 
 
 def is_working_status_valid(working_status: str):
+    """Check whether ``working_status`` is present in the predefined mapping."""
     return working_status in working_map
 
 
 def is_stroke_valid(stroke: int):
+    """Check whether ``stroke`` is a binary flag (0 or 1)."""
     return stroke == 0 or stroke == 1
 
 

From 6804cb72ef677df038cb16ddd65e3167f251530b Mon Sep 17 00:00:00 2001
From: wyl2003 <108109393+wyl2003@users.noreply.github.com>
Date: Tue, 19 May 2026 02:10:01 +0930
Subject: [PATCH 023/105] doc: add docstring for admin.py

---
 server/routers/admin.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/server/routers/admin.py b/server/routers/admin.py
index 67412aa1..174d921f 100644
--- a/server/routers/admin.py
+++ b/server/routers/admin.py
@@ -536,6 +536,7 @@ async def get_logs(
 
 @router.get("/admin-dashboard/active-account-analytics")
 async def get_active_account_analytics(request: Request, db_conn: Session = Depends(get_db)):
+    """Return counts of active standard-user accounts in the past month and week."""
     _confirm_admin(request, db_conn)
     prev_month = datetime.now() - timedelta(days=30)
     prev_week = datetime.now() - timedelta(days=7)
@@ -570,6 +571,7 @@ async def get_active_account_analytics(request: Request, db_conn: Session = Depe
 
 @router.get("/admin-dashboard/active-merchant-analytics")
 async def get_active_merchant_analytics(request: Request, db_conn: Session = Depends(get_db)):
+    """Return counts of active merchant accounts in the past month and week."""
     _confirm_admin(request, db_conn)
     prev_month = datetime.now() - timedelta(days=30)
     prev_week = datetime.now() - timedelta(days=7)
@@ -604,6 +606,7 @@ async def get_active_merchant_analytics(request: Request, db_conn: Session = Dep
 
 @router.get("/admin-dashboard/recent-reports-generated-analytics")
 async def get_reports_generated_analytics(request: Request, db_conn: Session = Depends(get_db)):
+    """Return counts of health reports generated in the past month and week."""
     _confirm_admin(request, db_conn)
     prev_month = datetime.now() - timedelta(days=30)
     prev_week = datetime.now() - timedelta(days=7)
@@ -628,6 +631,7 @@ async def get_reports_generated_analytics(request: Request, db_conn: Session = D
 
 @router.get("/admin-dashboard/pending-merchants-analytics")
 async def get_pending_merchant_analytics(request: Request, db_conn: Session = Depends(get_db)):
+    """Return the number of merchant accounts awaiting validation."""
     _confirm_admin(request, db_conn)
 
     pending_merchants = (
@@ -649,6 +653,7 @@ async def get_pending_merchant_analytics(request: Request, db_conn: Session = De
 
 @router.get("/admin-dashboard/predictions-distinct-years")
 async def get_predictions_distinct_years(request: Request, db_conn: Session = Depends(get_db)):
+    """Return a sorted list of distinct years in which predictions exist."""
     _confirm_admin(request, db_conn)
     query = db_conn.query(
         extract("year", Prediction.CreatedAt).label("year")
@@ -658,6 +663,15 @@ async def get_predictions_distinct_years(request: Request, db_conn: Session = De
 
 @router.get("/admin-dashboard/ave-risk-series/{year}")
 async def get_average_risk_series(year: int, request: Request, db_conn: Session = Depends(get_db)):
+    """
+    Return monthly average risk probabilities (stroke, diabetes, CVD) for a given year.
+
+    :param year: The calendar year to aggregate risk data for (e.g. 2025).
+    :param request: The HTTP request object (used for admin authentication).
+    :param db_conn: Database session provided by the FastAPI dependency.
+    :return: A list of dicts, each with ``date`` (YYYY-MM) and average ``stroke``,
+             ``diabetes``, ``cvd`` values.
+    """
     _confirm_admin(request, db_conn)
 
     year_start = datetime(year, 1, 1)
@@ -678,6 +692,7 @@ async def get_average_risk_series(year: int, request: Request, db_conn: Session
 
 @router.get("/admin-dashboard/login-activity/{timespanInDays}")
 async def get_login_activity(timespanInDays: int, request: Request, db_conn: Session = Depends(get_db)):
+    """Return daily login event counts over the specified number of days."""
     _confirm_admin(request, db_conn)
 
     start_date = datetime.now() - timedelta(days=timespanInDays)
@@ -695,6 +710,7 @@ async def get_login_activity(timespanInDays: int, request: Request, db_conn: Ses
 
 @router.get("/admin-dashboard/unvalidated-account-analytics")
 async def get_unvalidated_account_analytics(request: Request, db_conn: Session = Depends(get_db)):
+    """Return the number of standard-user accounts that have not been validated."""
     _confirm_admin(request, db_conn)
 
     unvalidated_accounts = (
@@ -715,6 +731,7 @@ async def get_unvalidated_account_analytics(request: Request, db_conn: Session =
 
 @router.get("/admin-dashboard/user-analytics")
 async def get_user_analytics(request: Request, db_conn: Session = Depends(get_db)):
+    """Return aggregated counts of total, standard, patient-only, and merchant accounts."""
     _confirm_admin(request, db_conn)
 
     account_total = db_conn.query(UserAccount).filter(
@@ -741,6 +758,7 @@ async def get_user_analytics(request: Request, db_conn: Session = Depends(get_db
 
 
 def _confirm_admin(request: Request, db_conn: Session):
+    """Verify the requesting user has an admin role; raises 403/404 otherwise."""
     user = get_current_user(request, db_conn)
     admin = db_conn.query(UserAccount).filter(
         UserAccount.Email == user["email"]).first()

From 069922357af03838f65ef2dd6ea6f8e6a0ded552 Mon Sep 17 00:00:00 2001
From: A-Axisa <a3132688@adelaide.edu.au>
Date: Tue, 19 May 2026 13:14:52 +0930
Subject: [PATCH 024/105] Add value property to display existing phone numbers

---
 client/src/components/authentication/PhoneInputField.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/client/src/components/authentication/PhoneInputField.js b/client/src/components/authentication/PhoneInputField.js
index 500ecdb2..5f593e81 100644
--- a/client/src/components/authentication/PhoneInputField.js
+++ b/client/src/components/authentication/PhoneInputField.js
@@ -14,8 +14,10 @@ import {
  * @param {function} [props.onChange] - Callback function called when input
  *   is changed.
  */
-const PhoneInputField = ({ onChange }) => {
-  const [rawPhoneNumber, setRawPhoneNumber] = useState("");
+const PhoneInputField = ({ onChange, value }) => {
+  const [rawPhoneNumber, setRawPhoneNumber] = useState(
+    value === null ? value : "",
+  );
   const [selectedDialingCode, setSelectedDialingCode] = useState("");
   const [isValid, setIsValid] = useState(true);
   const [isValidDialingCode, setIsValidDialingCode] = useState(true);
@@ -82,6 +84,7 @@ const PhoneInputField = ({ onChange }) => {
       onChange?.({
         phone: outputPhoneNumber,
         isValid: true,
+        rawDigits: phoneNumber,
       });
     } else {
       setIsValid(false);
@@ -89,6 +92,7 @@ const PhoneInputField = ({ onChange }) => {
       onChange?.({
         phone: null,
         isValid: false,
+        rawDigits: phoneNumber,
       });
     }
   }
@@ -128,6 +132,7 @@ const PhoneInputField = ({ onChange }) => {
             id="outlined-input"
             name="phone"
             label="Phone"
+            value={value}
             onChange={updatePhoneNumber}
             sx={{ width: "100%" }}
           ></TextField>

From 15f58d12fb421aba81ee4ae4123ce13d1bccb0a2 Mon Sep 17 00:00:00 2001
From: A-Axisa <a3132688@adelaide.edu.au>
Date: Tue, 19 May 2026 13:17:25 +0930
Subject: [PATCH 025/105] Add clarification to component parameters

---
 client/src/components/authentication/PhoneInputField.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/client/src/components/authentication/PhoneInputField.js b/client/src/components/authentication/PhoneInputField.js
index 5f593e81..ce9358ab 100644
--- a/client/src/components/authentication/PhoneInputField.js
+++ b/client/src/components/authentication/PhoneInputField.js
@@ -11,8 +11,9 @@ import {
  * selection for a dialling code.
  *
  * @param {Object} props
- * @param {function} [props.onChange] - Callback function called when input
- *   is changed.
+ * @param {function} [props.onChange] - Callback function to call when input is changed.
+ *                                      Event parameters: phone, isValid, and rawDigits
+ * @param {String} [props.value] - Phone number
  */
 const PhoneInputField = ({ onChange, value }) => {
   const [rawPhoneNumber, setRawPhoneNumber] = useState(

From 71ad55f140645caf5ad2a096a1f69eca66967f4b Mon Sep 17 00:00:00 2001
From: A-Axisa <a3132688@adelaide.edu.au>
Date: Tue, 19 May 2026 13:22:04 +0930
Subject: [PATCH 026/105] Replace TextField for PhoneInputField component

---
 client/src/routes/UserSettings.js | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/client/src/routes/UserSettings.js b/client/src/routes/UserSettings.js
index 753b7655..7cd18140 100644
--- a/client/src/routes/UserSettings.js
+++ b/client/src/routes/UserSettings.js
@@ -21,6 +21,7 @@ import {
 import ConfirmationDialog from "../components/confirmationDialog";
 import { useNavigate } from "react-router-dom";
 import { UserContext } from "../utils/UserContext";
+import PhoneInputField from "../components/authentication/PhoneInputField";
 
 const UserSettings = () => {
   const navigate = useNavigate();
@@ -65,6 +66,9 @@ const UserSettings = () => {
   const [deleteBusy, setDeleteBusy] = useState(false);
   const [deleteError, setDeleteError] = useState("");
 
+  const [isPhoneValid, setIsPhoneValid] = useState(true);
+  const [rawPhoneDigits, setRawPhoneDigits] = useState("");
+
   // Resolve API base from environment variable
   const API_BASE = useMemo(
     () => process.env.REACT_APP_API_URL || "http://localhost:8000",
@@ -90,6 +94,7 @@ const UserSettings = () => {
       height: user.height ?? "",
       weight: user.weight ?? "",
     }));
+    setRawPhoneDigits(user.phone_number || "");
   }, [user]);
 
   const clearMessages = () => {
@@ -190,6 +195,11 @@ const UserSettings = () => {
 
   const handleAccountSave = async () => {
     clearMessages();
+    if (!isPhoneValid) {
+      setSaveError("Please provide a valid phone number.");
+      return;
+    }
+
     setAccountSaving(true);
     try {
       const phone = formData.phone ?? "";
@@ -276,12 +286,14 @@ const UserSettings = () => {
           helperText="Email update is currently not supported"
           fullWidth
         />
-        <TextField
-          label="Phone Number"
-          value={formData.phone}
-          onChange={(e) => updateForm("phone", e.target.value)}
-          helperText="Only digits will be stored"
-          fullWidth
+        <PhoneInputField
+          onChange={(e) => {
+            updateForm("phone", e.phone);
+            setIsPhoneValid(e.isValid);
+            setRawPhoneDigits(e.rawDigits);
+            console.log(e);
+          }}
+          value={rawPhoneDigits}
         />
       </Box>
 

From 45d1146fc24c84decc53a8ed2f48f502c8176d8e Mon Sep 17 00:00:00 2001
From: A-Axisa <a3132688@adelaide.edu.au>
Date: Tue, 19 May 2026 13:35:52 +0930
Subject: [PATCH 027/105] Fix information leakage issue with logging error

---
 client/src/routes/UserSettings.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/routes/UserSettings.js b/client/src/routes/UserSettings.js
index 7cd18140..82f6fe0a 100644
--- a/client/src/routes/UserSettings.js
+++ b/client/src/routes/UserSettings.js
@@ -147,7 +147,7 @@ const UserSettings = () => {
         return response.json();
       })
       .catch((error) => {
-        console.log(error);
+        console.log("Failed to change password");
       });
   }
 

From b5da5e8b93fbd4f2c8686c022cfad1700d6d835e Mon Sep 17 00:00:00 2001
From: A-Axisa <a3132688@adelaide.edu.au>
Date: Tue, 19 May 2026 13:38:17 +0930
Subject: [PATCH 028/105] Fix additional information leakage issue

---
 client/src/routes/UserSettings.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client/src/routes/UserSettings.js b/client/src/routes/UserSettings.js
index 82f6fe0a..d9bb3f41 100644
--- a/client/src/routes/UserSettings.js
+++ b/client/src/routes/UserSettings.js
@@ -291,7 +291,6 @@ const UserSettings = () => {
             updateForm("phone", e.phone);
             setIsPhoneValid(e.isValid);
             setRawPhoneDigits(e.rawDigits);
-            console.log(e);
           }}
           value={rawPhoneDigits}
         />

From dfd61ddbf20dc4db52edf58e01ab1202ad4aa963 Mon Sep 17 00:00:00 2001
From: A-Axisa <a3132688@adelaide.edu.au>
Date: Tue, 19 May 2026 13:51:01 +0930
Subject: [PATCH 029/105] fix: Update routing to use revised route name

---
 client/src/routes/HealthAnalytics.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/routes/HealthAnalytics.js b/client/src/routes/HealthAnalytics.js
index 39fc7d4b..4126d03f 100644
--- a/client/src/routes/HealthAnalytics.js
+++ b/client/src/routes/HealthAnalytics.js
@@ -456,7 +456,7 @@ const HealthAnalytics = () => {
             >
               <Button
                 variant="outlined"
-                href="/ai-health-prediction"
+                href="/report-history"
                 sx={{
                   width: isMobile ? "100%" : "auto",
                   py: { xs: "0.8rem", sm: "0.6rem" },

From 14432391a301111bd28e650098c45a592e7239a1 Mon Sep 17 00:00:00 2001
From: wyl2003 <108109393+wyl2003@users.noreply.github.com>
Date: Tue, 19 May 2026 15:46:33 +0930
Subject: [PATCH 030/105] doc: update docstring for authentication.py

---
 server/routers/authentication.py | 146 +++++++++++++++++++++++++++----
 1 file changed, 131 insertions(+), 15 deletions(-)

diff --git a/server/routers/authentication.py b/server/routers/authentication.py
index d230c2d5..271f9205 100644
--- a/server/routers/authentication.py
+++ b/server/routers/authentication.py
@@ -107,7 +107,17 @@ class PasswordResetRequest(BaseModel):
 @router.post("/register")
 async def register(user_reg: UserRegistrationDetails,
                    db_conn: Session = Depends(get_db)):
-    """Register a new account for the user provided the details are valid."""
+    """
+    Register a new user account after validating all input fields.
+
+    Creates the user record, assigns a role, optionally creates a patient
+    profile (standard users), and generates an email-validation token.
+
+    :param user_reg: Registration details including personal info, credentials, and account type.
+    :param db_conn: Database session provided by the FastAPI dependency.
+    :return: A dict with a success message.
+    :raises HTTPException 422: If any input field fails validation.
+    """
 
     formatted_phone = format_phone_number(user_reg.phone)
 
@@ -189,7 +199,7 @@ async def register(user_reg: UserRegistrationDetails,
 
 
 def _send_validation_email(user: UserAccount, token: str):
-    """Helper function to send a validation email."""
+    """Send an email-validation link to the newly registered user."""
     validation_url = f"http://localhost:8000/validate-email?token={token}"
     email_subject = "Validate your account"
     email_content = f"""
@@ -211,11 +221,11 @@ def _send_validation_email(user: UserAccount, token: str):
 
 @router.get("/validate-email")
 async def validate_email_address(token: str, db_conn: Session = Depends(get_db)):
+    """Validate a user's email address via a signed token sent by email."""
     validation_failure_exception = HTTPException(
         status_code=status.HTTP_400_BAD_REQUEST,
         detail="Invalid or expired validation token."
     )
-    """Validates a user's account"""
 
     # Find the token in the database
     validation_token_entry = db_conn.query(
@@ -274,7 +284,19 @@ async def validate_email_address(token: str, db_conn: Session = Depends(get_db))
 @router.post('/login')
 async def login(request: Request, response: Response, user_cred: LoginCredentials,
                 db_conn: Session = Depends(get_db)):
-    """Authenticates a user with the credentials and provides an access token."""
+    """
+    Authenticate a user and issue an http-only cookie with a JWT access token.
+
+    Validates credentials, increments the token version (invalidating previous
+    sessions), and sets the ``auth_token`` cookie on the response.
+
+    :param request: The HTTP request (used for audit-logging client metadata).
+    :param response: The HTTP response (used to set the cookie).
+    :param user_cred: Login credentials (email and password).
+    :param db_conn: Database session provided by the FastAPI dependency.
+    :return: A dict with a success message.
+    :raises HTTPException 401: If credentials are incorrect.
+    """
 
     credentials_exception = HTTPException(
         status_code=status.HTTP_401_UNAUTHORIZED,
@@ -331,7 +353,17 @@ async def login(request: Request, response: Response, user_cred: LoginCredential
 
 
 def authenticate_user(email: str, password: str, db_conn: Session):
-    """Authenticates a user from the provided email and password."""
+    """
+    Verify credentials and return the user account if authentication succeeds.
+
+    Checks the user exists, is validated (if email validation is enabled),
+    and the password matches the stored hash.
+
+    :param email: The user's email address.
+    :param password: The plain-text password to verify.
+    :param db_conn: Database session.
+    :return: The ``UserAccount`` object if authentication succeeds, ``False`` otherwise.
+    """
     user = db_conn.query(UserAccount).filter_by(Email=email).first()
     if not user:
         return False
@@ -350,7 +382,16 @@ def verify_password(password_text: str, password_hash: str) -> bool:
 
 
 def create_access_token(data: dict, expires_delta: timedelta | None = None):
-    """Returns JWT containing the access token with the given data."""
+    """
+    Create a signed JWT access token containing the given claims.
+
+    Encodes the data dict with an ``exp`` claim set to the current time plus
+    the provided delta (or a default of 10 minutes).
+
+    :param data: Claims to encode (must include ``sub`` for the subject).
+    :param expires_delta: Optional custom expiration duration.
+    :return: A signed JWT string.
+    """
     to_encode = data.copy()
     if expires_delta:
         expire = datetime.now(timezone.utc) + expires_delta
@@ -363,12 +404,24 @@ def create_access_token(data: dict, expires_delta: timedelta | None = None):
 
 @router.get('/user/me')
 async def get_user_me(request: Request, db_conn: Session = Depends(get_db)):
-    """Endpoint for retrieving the currently active user on a device."""
+    """Return the currently authenticated user's profile information."""
     return get_current_user(request, db_conn)
 
 
 def get_current_user(request: Request, db_conn: Session):
-    """Returns user information from the http-only cookie on their device."""
+    """
+    Extract and return the authenticated user's details from the http-only cookie.
+
+    Decodes the JWT in the ``auth_token`` cookie, validates the token version
+    against the database, and fetches the user's role and patient profile.
+
+    :param request: The HTTP request containing the ``auth_token`` cookie.
+    :param db_conn: Database session.
+    :return: A dict with keys ``email``, ``role``, ``name``, ``phone_number``,
+             ``given_names``, ``family_name``, ``gender``, ``weight``, ``height``,
+             ``date_of_birth``.
+    :raises HTTPException 401: If the token is missing, invalid, or expired.
+    """
 
     # Prepare an exception for invalid or missing credentials.
     credentials_exception = HTTPException(
@@ -451,7 +504,17 @@ def get_user_role(email: str, db_conn: Session):
 
 @router.post('/logout')
 def logout_current_user(request: Request, response: Response, db_conn: Session = Depends(get_db)):
-    """Deletes the user cookie and invalidates their access token."""
+    """
+    Log out the current user by deleting the auth cookie and invalidating the token.
+
+    Increments the token version in the database so existing JWTs are rejected,
+    then removes the ``auth_token`` cookie from the response.
+
+    :param request: The HTTP request (for current-user extraction).
+    :param response: The HTTP response (for cookie deletion).
+    :param db_conn: Database session.
+    :return: ``None`` (cookie is deleted on the response object).
+    """
     try:
         user = get_current_user(request, db_conn)
         if user:
@@ -477,7 +540,16 @@ def invalidate_access_token(email: str, db_conn: Session):
 
 
 def is_password_valid(password: str):
-    """Verifies the password follows policy rules."""
+    """
+    Verify a password meets all policy requirements.
+
+    Rules: at least one lowercase, one uppercase, one digit, one symbol
+    (from ``VALID_PASSWORD_SYMBOLS``), and length between ``PASSWORD_MIN_LENGTH``
+    and ``PASSWORD_MAX_LENGTH``.
+
+    :param password: The plain-text password to check.
+    :return: ``True`` if the password complies with policy, ``False`` otherwise.
+    """
 
     contains_lower = any(c.islower() for c in password)
     contains_upper = any(c.isupper() for c in password)
@@ -494,7 +566,7 @@ def is_password_valid(password: str):
 
 
 def is_email_valid(email: str):
-    """Verifies a password follow the pattern xxx@xxx.xxx."""
+    """Verifies an email follows the pattern xxx@xxx.xxx."""
     if not email:
         return False
     try:
@@ -555,7 +627,19 @@ def is_age_valid(date_of_birth: date):
 
 @router.post('/change-password')
 def change_password_current_user(password_details: ChangePasswordDetails, request: Request, db_conn: Session = Depends(get_db)):
-    """Change a user's password"""
+    """
+    Change the authenticated user's password after verifying their current password.
+
+    Validates the current password, confirms the new password matches the
+    confirmation field, then hashes and persists the new password.
+
+    :param password_details: Object containing ``current_password``, ``new_password``,
+                             and ``confirm_new_password``.
+    :param request: The HTTP request (for current-user extraction and audit logging).
+    :param db_conn: Database session.
+    :return: A dict with a success message.
+    :raises HTTPException 401: If current password is wrong or new passwords don't match.
+    """
 
     # Retrieve current user data
     user_email = get_current_user(request, db_conn)
@@ -590,7 +674,18 @@ def change_password_current_user(password_details: ChangePasswordDetails, reques
 
 @router.post('/forgot-password')
 def forgot_password(forgot_password_request: ForgotPasswordRequest, request: Request, db_conn: Session = Depends(get_db)):
-    """Generates a reset password token for a given email."""
+    """
+    Generate a password-reset token and email it to the user (if the account exists).
+
+    Sanitises the email, looks up the user (excluding admin accounts), creates
+    a time-limited reset token, and sends a reset link. Responds identically
+    whether or not the email exists (to prevent enumeration).
+
+    :param forgot_password_request: Object containing the user's email address.
+    :param request: The HTTP request (for audit-logging client metadata).
+    :param db_conn: Database session.
+    :return: ``None`` (email is sent asynchronously).
+    """
     is_success = False
 
     sanitised_email = re.sub(r'[()<>[\]:,;\\]', '',
@@ -642,7 +737,18 @@ async def password_reset(
     request: Request,
     db_conn: Session = Depends(get_db)
 ):
-    """Updates a user's password if the token is valid and password are valid."""
+    """
+    Reset a user's password using a valid, non-expired reset token.
+
+    Validates the token, checks the new password against policy rules,
+    hashes it, and persists the change. The token is consumed (deleted)
+    regardless of success to prevent replay.
+
+    :param reset_request: Object containing the reset token and new password.
+    :param request: The HTTP request (for audit-logging client metadata).
+    :param db_conn: Database session.
+    :return: ``None`` (audit log is written on every attempt).
+    """
     is_successful = False
     user = None
 
@@ -674,7 +780,17 @@ async def password_reset(
 
 
 def _send_reset_password_email(user: UserAccount, patient: Patient, request: Request, token: str):
-    """Helper function to send a validation email."""
+    """
+    Send a password-reset email containing a signed link to the user.
+
+    Sanitises all dynamic content (token, name, IP, device) before embedding
+    in the HTML email to prevent XSS in rendered email clients.
+
+    :param user: The target user account.
+    :param patient: The user's patient profile (for personalisation).
+    :param request: The HTTP request (for client IP and user-agent).
+    :param token: The unsigned reset token to embed in the link.
+    """
     sanitizer = Sanitizer()
     sanitized_token = sanitizer.sanitize(token)
     given_names = sanitizer.sanitize(patient.GivenNames)

From 6acf3fdd806ffed2b68bb866a5e07ad26fe1972a Mon Sep 17 00:00:00 2001
From: wyl2003 <108109393+wyl2003@users.noreply.github.com>
Date: Tue, 19 May 2026 17:35:28 +0930
Subject: [PATCH 031/105] doc: update and add doc in users.py

---
 server/routers/users.py | 174 +++++++++++++++++++++++++++++++++++++---
 1 file changed, 162 insertions(+), 12 deletions(-)

diff --git a/server/routers/users.py b/server/routers/users.py
index dca52e97..a5a86485 100644
--- a/server/routers/users.py
+++ b/server/routers/users.py
@@ -135,6 +135,7 @@ class PatientAcceptDetails(BaseModel):
 
 
 def _to_float(val) -> float:
+    """Safely convert a value to float, returning 0.0 on failure."""
     if isinstance(val, Decimal):
         return float(val)
     try:
@@ -147,6 +148,7 @@ def _to_float(val) -> float:
 
 
 def _validated_name(value: Optional[str], field_name: str) -> Optional[str]:
+    """Sanitise and validate a name field; raises 422 if longer than 255 chars."""
     if value is None:
         return None
     sanitizer = Sanitizer()
@@ -160,6 +162,7 @@ def _validated_name(value: Optional[str], field_name: str) -> Optional[str]:
 
 
 def _to_nullable_float(value: Optional[float], field_name: str, min_v: float, max_v: float) -> Optional[float]:
+    """Validate and return a nullable float within [min_v, max_v]; raises 422 if out of range."""
     if value is None:
         return None
     if value < min_v or value > max_v:
@@ -176,7 +179,20 @@ async def update_current_user_profile(
     request: Request,
     db_conn: Session = Depends(get_db),
 ):
-    """Updates a user's account information"""
+    """
+    Update the authenticated user's account-level profile fields.
+
+    Currently supports updating the ``phone_number`` field. The phone is
+    formatted and validated before persisting.
+
+    :param payload: Object containing the fields to update (only ``phone_number`` supported).
+    :param request: The HTTP request (for audit-logging client metadata).
+    :param db_conn: Database session.
+    :return: A dict with a success message and the updated fields.
+    :raises HTTPException 404: If the user is not found.
+    :raises HTTPException 400: If no fields are provided for update.
+    :raises HTTPException 422: If the phone number is invalid.
+    """
     current_user = get_current_user(request, db_conn)
     user = get_user(current_user["email"], db_conn)
     if user is None:
@@ -220,7 +236,21 @@ async def update_current_patient_profile(
     request: Request,
     db_conn: Session = Depends(get_db),
 ):
-    """Update a user's patient information"""
+    """
+    Update the authenticated user's patient profile fields.
+
+    Supports updating ``given_names``, ``family_name``, ``gender``, ``weight``,
+    ``height``, and ``date_of_birth``. Creates a patient record if one does
+    not already exist.
+
+    :param payload: Object containing the fields to update.
+    :param request: The HTTP request (for audit-logging client metadata).
+    :param db_conn: Database session.
+    :return: A dict with a success message and the updated fields.
+    :raises HTTPException 404: If the user is not found.
+    :raises HTTPException 400: If no fields are provided for update.
+    :raises HTTPException 422: If any field fails validation.
+    """
     current_user = get_current_user(request, db_conn)
     user = get_user(current_user["email"], db_conn)
     if user is None:
@@ -301,7 +331,17 @@ async def update_current_patient_profile(
 
 def _delete_user_data(user_id: int, db_conn: Session):
     """
-    Deletes a user and all their associated data, returning a report of the deletion.
+    Delete a user and all associated data (cascading), returning a deletion report.
+
+    Removes patient access links, recommendations, predictions, health data,
+    validation tokens, and role mappings in the correct order to avoid
+    foreign-key violations. Rolls back on failure.
+
+    :param user_id: The ``UserID`` of the account to delete.
+    :param db_conn: Database session.
+    :return: A dict with counts of deleted records per table.
+    :raises HTTPException 404: If the user is not found.
+    :raises HTTPException 500: If the deletion fails.
     """
     deletion_report = {}
 
@@ -368,7 +408,18 @@ def _delete_user_data(user_id: int, db_conn: Session):
 
 @router.delete("/users/")
 async def delete_user(request: Request, db_conn: Session = Depends(get_db)):
-    """Delete a users account and their related data"""
+    """
+    Delete the authenticated user's account and all associated data.
+
+    Cascades to remove patient access links, health data, predictions,
+    recommendations, validation tokens, and role mappings.
+
+    :param request: The HTTP request (for current-user extraction and audit logging).
+    :param db_conn: Database session.
+    :return: A dict with a success message.
+    :raises HTTPException 401: If credentials are invalid.
+    :raises HTTPException 404: If the user is not found.
+    """
     # Current request user
     current = get_current_user(request, db_conn)
     request_user_email = current.get(
@@ -459,7 +510,15 @@ def month_label(dt: datetime) -> str:
 
 @router.get("/report-data/{healthDataId}")
 async def get_report_data(healthDataId: int, db_conn: Session = Depends(get_db)):
-    """Return data for a report"""
+    """
+    Return a full health report (metrics, predictions, recommendations) by health-data ID.
+
+    :param healthDataId: The primary key of the ``HealthData`` record.
+    :param db_conn: Database session.
+    :return: A ``Report`` object containing patient info, vitals, risk probabilities,
+             and AI recommendations.
+    :raises HTTPException 404: If the health data is not found.
+    """
     validID = db_conn.query(HealthData).filter_by(
         HealthDataID=healthDataId).first()
     if not validID:
@@ -526,7 +585,18 @@ async def get_report_data(healthDataId: int, db_conn: Session = Depends(get_db))
 
 @router.delete("/report-data/{healthDataId}")
 async def delete_report_data(healthDataId: int, db_conn: Session = Depends(get_db)):
-    """Deletes data from a generated report"""
+    """
+    Delete a health report and its associated predictions and recommendations.
+
+    Removes the recommendation and prediction records first to avoid foreign-key
+    violations, then deletes the health-data row itself.
+
+    :param healthDataId: The primary key of the ``HealthData`` record to delete.
+    :param db_conn: Database session.
+    :return: A dict with a success message.
+    :raises HTTPException 404: If the health data is not found.
+    :raises HTTPException 500: If the database deletion fails.
+    """
    # Raise exception if health data is not in the DB
     health_data = db_conn.query(HealthData).filter_by(
         HealthDataID=healthDataId).first()
@@ -644,7 +714,19 @@ async def get_clinic_names(request: Request, db_conn: Session = Depends(get_db))
 
 @router.post("/create-patient/")
 async def create_patient(patient: PatientCreationDetails, request: Request, db_conn: Session = Depends(get_db),):
-    """Creates a new patient record and creates a relationship between the merchant and patient"""
+    """
+    Create a new patient record and link it to the requesting merchant.
+
+    Sanitises name inputs, checks for duplicate patients by name + DOB + gender,
+    then creates the patient and grants the merchant access.
+
+    :param patient: Patient creation details (names, DOB, gender, weight, height).
+    :param request: The HTTP request (for current-merchant extraction).
+    :param db_conn: Database session.
+    :return: A dict with a success message and the new ``patient_id``.
+    :raises HTTPException 422: If any input field fails validation.
+    :raises HTTPException 409: If a matching patient already exists.
+    """
     # Check if the requesting user is a merchant.
     merchant = get_current_merchant(request, db_conn)
 
@@ -767,7 +849,15 @@ async def associated_patients(request: Request, given_names: str = None, family_
 
 
 def get_current_merchant(request: Request, db_conn):
-    """Check if the current user is a merchant"""
+    """
+    Verify the requesting user is a merchant and return their ``UserAccount``.
+
+    :param request: The HTTP request (for cookie-based user extraction).
+    :param db_conn: Database session.
+    :return: The ``UserAccount`` object of the merchant.
+    :raises HTTPException 404: If the user is not found.
+    :raises HTTPException 403: If the user's role is not ``merchant``.
+    """
 
     # Check if the requesting user is a merchant.
     current_user = get_current_user(request, db_conn)
@@ -797,7 +887,18 @@ def get_merchant_patients(merchantID: int, db_conn):
 
 @router.get("/dashboard", response_model=Dashboard)
 async def get_dashboard(request: Request, db_conn: Session = Depends(get_db)):
-    """Returns a user's dashboard information"""
+    """
+    Return the authenticated user's dashboard with latest risks, trends, and recommendations.
+
+    Fetches the last 5 predictions and calculates risk deltas, days since last
+    report, and the most recent AI-generated recommendations.
+
+    :param request: The HTTP request (for current-user extraction).
+    :param db_conn: Database session.
+    :return: A ``Dashboard`` object containing ``days``, ``risks``, ``diff``,
+             and ``recommendations``.
+    :raises HTTPException 404: If the patient record is not found.
+    """
     user = get_current_user(request, db_conn)
     patient = get_patient_by_email(user["email"], db_conn)
 
@@ -882,6 +983,17 @@ async def get_dashboard(request: Request, db_conn: Session = Depends(get_db)):
 
 @router.get("/merchant-dashboard", response_model=MerchantDashboard)
 async def get_merchant_dashboard(request: Request, db_conn: Session = Depends(get_db)):
+    """
+    Return the merchant dashboard with patient/report stats and risk distributions.
+
+    Aggregates data across all patients linked to the merchant: total and
+    inactive patient counts, report volumes, per-disease risk distribution
+    (high / moderate / low), and recent report activity.
+
+    :param request: The HTTP request (for current-merchant extraction).
+    :param db_conn: Database session.
+    :return: A ``MerchantDashboard`` object with aggregated analytics.
+    """
 
     merchant = get_current_merchant(request, db_conn)
     merchant_id = merchant.UserID
@@ -1162,7 +1274,21 @@ async def get_dashboard(patient_id: str, request: Request, db_conn: Session = De
 
 @router.post('/patient-request')
 def patient_request(patient_request: PatientRequest, request: Request, db_conn: Session = Depends(get_db)):
-    """Generates a patient request token for a given patient email."""
+    """
+    Generate a time-limited access token and email a patient access request.
+
+    The merchant can request access to a patient's records via email. A
+    7-day token is created and emailed to the patient for approval.
+    Only one active token is allowed per merchant-patient pair.
+
+    :param patient_request: Object containing the patient's email address.
+    :param request: The HTTP request (for current-merchant extraction).
+    :param db_conn: Database session.
+    :return: A dict with a success message.
+    :raises HTTPException 422: If the email is invalid.
+    :raises HTTPException 404: If no patient is found for the email.
+    :raises HTTPException 409: If the merchant already has access to the patient.
+    """
 
     # Check the current user is a merchant
     merchant = get_current_merchant(request, db_conn)
@@ -1224,7 +1350,20 @@ def patient_request(patient_request: PatientRequest, request: Request, db_conn:
 
 @router.post('/patient-accept-request')
 def patient_accept_request(patient_accept_details: PatientAcceptDetails, request: Request, db_conn: Session = Depends(get_db)):
-    """Allows a patient to accept a request to be added to a merchant account"""
+    """
+    Verify a patient-access token and grant the merchant access to the patient's records.
+
+    The authenticated standard user must match the patient the request was
+    created for. On success, the token is consumed and a ``UserPatientAccess``
+    row is created.
+
+    :param patient_accept_details: Object containing the signed access token.
+    :param request: The HTTP request (for current-user extraction).
+    :param db_conn: Database session.
+    :return: A dict with a success message.
+    :raises HTTPException 403: If the user is not a standard user or doesn't match the patient.
+    :raises HTTPException 404: If the token is invalid, expired, or the patient is not found.
+    """
 
     # Get current user's details
     current_user = get_current_user(request, db_conn)
@@ -1269,7 +1408,18 @@ def patient_accept_request(patient_accept_details: PatientAcceptDetails, request
 
 
 def send_patient_request_email(email: str, patient: Patient, clinic: str, request: Request, token: str):
-    """Helper function to send a patient request email."""
+    """
+    Send an email to a patient requesting permission for a merchant to access their records.
+
+    All dynamic content (token, name, clinic) is sanitised before embedding
+    in the HTML email body.
+
+    :param email: The recipient patient's email address.
+    :param patient: The patient's profile (for personalisation).
+    :param clinic: The requesting clinic's name.
+    :param request: The HTTP request (for client-context logging; unused in body).
+    :param token: The unsigned access-request token to embed in the link.
+    """
     sanitizer = Sanitizer()
     sanitized_token = sanitizer.sanitize(token)
     given_names = sanitizer.sanitize(patient.GivenNames)

From 12fec9cb7975b4bae703added48dc51364a40735 Mon Sep 17 00:00:00 2001
From: Luke Bradley <bralc003@mymail.unisa.edu.au>
Date: Tue, 19 May 2026 19:33:27 +0930
Subject: [PATCH 032/105] Update database to include new lifestyle data

---
 ...dd_race_to_prediction_and_patient_table.py | 42 +++++++++++++++++++
 server/models/dbmodels.py                     | 35 +++++++++++++---
 2 files changed, 72 insertions(+), 5 deletions(-)
 create mode 100644 server/alembic/versions/c173c206403b_add_race_to_prediction_and_patient_table.py

diff --git a/server/alembic/versions/c173c206403b_add_race_to_prediction_and_patient_table.py b/server/alembic/versions/c173c206403b_add_race_to_prediction_and_patient_table.py
new file mode 100644
index 00000000..58f736bd
--- /dev/null
+++ b/server/alembic/versions/c173c206403b_add_race_to_prediction_and_patient_table.py
@@ -0,0 +1,42 @@
+"""Add race to prediction and patient table
+
+Revision ID: c173c206403b
+Revises: d89af5748b27
+Create Date: 2026-05-19 19:32:41.936172
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import mysql
+
+# revision identifiers, used by Alembic.
+revision: str = 'c173c206403b'
+down_revision: Union[str, Sequence[str], None] = 'd89af5748b27'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    """Upgrade schema."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('HealthData', sa.Column('Race', sa.Integer(), nullable=True))
+    op.alter_column('HealthData', 'Alcohol',
+               existing_type=mysql.TINYINT(display_width=1),
+               type_=sa.Integer(),
+               existing_nullable=True)
+    op.add_column('Patient', sa.Column('Race', sa.Integer(), nullable=True))
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    """Downgrade schema."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('Patient', 'Race')
+    op.alter_column('HealthData', 'Alcohol',
+               existing_type=sa.Integer(),
+               type_=mysql.TINYINT(display_width=1),
+               existing_nullable=True)
+    op.drop_column('HealthData', 'Race')
+    # ### end Alembic commands ###
diff --git a/server/models/dbmodels.py b/server/models/dbmodels.py
index 38fe314d..66515d0d 100644
--- a/server/models/dbmodels.py
+++ b/server/models/dbmodels.py
@@ -14,6 +14,13 @@
     3: 'Public',
 }
 
+RACE_OPTIONS = {
+    0: 'Malay',
+    1: 'Chinese',
+    2: 'Indian',
+    3: 'Other'
+}
+
 Base = declarative_base()
 
 
@@ -144,6 +151,7 @@ class Patient(Base):
     CreatedAt = Column(DateTime, server_default=text('CURRENT_TIMESTAMP'))
     MaritalStatus = Column(Integer)
     WorkingStatus = Column(Integer)
+    Race = Column(Integer)
 
     user = relationship("UserAccount", back_populates="patients")
     health_records = relationship("HealthData", back_populates="patient")
@@ -159,7 +167,8 @@ def __init__(
             height,
             date_of_birth,
             marital_status=None,
-            working_status=None
+            working_status=None,
+            race=None
     ):
         self.UserID = user_id
         self.GivenNames = given_names
@@ -170,6 +179,7 @@ def __init__(
         self.DateOfBirth = date_of_birth
         self.MaritalStatus = marital_status
         self.WorkingStatus = working_status
+        self.race = race
 
     def __repr__(self):
         return f'Patient(PatientID={self.PatientID}, UserID={self.UserID}, givenNames={self.GivenNames}, \
@@ -184,6 +194,10 @@ def get_working_status(self):
         """Returns working status as a string."""
         return WORKING_STATUS_OPTIONS.get(self.WorkingStatus)
 
+    def get_working_status(self):
+        """Returns race as a string."""
+        return RACE_OPTIONS.get(self.Race)
+
     def set_marital_status(self, status: int | str):
         """Sets the value of the marital status and will convert a string
         to the matching integer."""
@@ -202,6 +216,15 @@ def set_working_status(self, status: int | str):
         else:
             self.WorkingStatus = status
 
+    def set_race(self, race: int | str):
+        """Sets the value of the race and will convert a string
+        to the matching integer."""
+        if isinstance(race, str):
+            self.Race = next(
+                (k for k, v in RACE_OPTIONS.items() if v == race), None)
+        else:
+            self.Race = race
+
 
 class UserPatientAccess(Base):
     __tablename__ = 'UserPatientAccess'
@@ -240,12 +263,13 @@ class HealthData(Base):
     HyperTension = Column(Boolean)
     HeartDisease = Column(Boolean)
     Diabetes = Column(Boolean)
-    Alcohol = Column(Boolean)
+    Alcohol = Column(Integer)
     SmokingStatus = Column(Integer)
     MaritalStatus = Column(Integer)
     WorkingStatus = Column(Integer)
     CreatedAt = Column(DateTime, server_default=text('CURRENT_TIMESTAMP'))
     Stroke = Column(Integer)
+    Race = Column(Integer)
 
     patient = relationship("Patient", back_populates="health_records")
     predictions = relationship("Prediction", back_populates="health_data")
@@ -254,7 +278,7 @@ class HealthData(Base):
 
     def __init__(self, PatientID, age, weight, height, gender, bloodGlucose, ap_hi,
                  ap_lo, highCholesterol, hyperTension, heartDisease,
-                 diabetes, alcohol, smoker, maritalStatus, workingStatus, stroke):
+                 diabetes, alcohol, smoker, maritalStatus, workingStatus, stroke, race):
         self.PatientID = PatientID
         self.Age = age
         self.WeightKilograms = weight
@@ -271,7 +295,8 @@ def __init__(self, PatientID, age, weight, height, gender, bloodGlucose, ap_hi,
         self.SmokingStatus = smoker
         self.MaritalStatus = maritalStatus
         self.WorkingStatus = workingStatus
-        self.Stroke = stroke
+        self.Stroke = stroke,
+        self.Race = race
 
     def __repr__(self):
         return f'HealthData(HealthDataID = {self.HealthDataID}, UserID={self.UserID}, age={self.Age}, weight={self.WeightKilograms}, \
@@ -279,7 +304,7 @@ def __repr__(self):
             ap_hi={self.APHigh}, ap_lo={self.APLow}, highCholesterol={self.HighCholesterol}, \
             hyperTension={self.HyperTension}, heartDisease={self.HeartDisease}, \
             diabetes={self.Diabetes}, alcohol={self.Alcohol}, smoker={self.SmokingStatus}, \
-            maritalStatus={self.MaritalStatus}, workingStatus={self.WorkingStatus}, Created={self.CreatedAt},  Stroke={self.Stroke} )'
+            maritalStatus={self.MaritalStatus}, workingStatus={self.WorkingStatus}, race={self.Race}, Created={self.CreatedAt},  Stroke={self.Stroke} )'
 
 
 class Prediction(Base):

From efb03f5bdd8ba625b7c4a69b0b01958a8c5c331f Mon Sep 17 00:00:00 2001
From: wyl2003 <108109393+wyl2003@users.noreply.github.com>
Date: Tue, 19 May 2026 20:17:35 +0930
Subject: [PATCH 033/105] docs: add docstring in log and encryptor.py

---
 server/utils/audit_log.py | 17 ++++++++++++++---
 server/utils/encryptor.py | 25 +++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/server/utils/audit_log.py b/server/utils/audit_log.py
index 172b7e44..a71e385f 100644
--- a/server/utils/audit_log.py
+++ b/server/utils/audit_log.py
@@ -2,11 +2,22 @@
 from ..models.dbmodels import AuditLog, LogEventType
 
 
-# Utility function for writing audit logs to the database.
-# Call this from any router when a loggable event occurs.
-
 def write_audit_log(db_conn: Session, eventType: LogEventType, success: bool, userID: int = None,
                      userEmail: str = None, ipAddress: str = None, device: str = None, description: str = None):
+    """Persist an audit-log entry to the database and commit immediately.
+
+    Call this from any router when a loggable event occurs. Failures are
+    silently caught and printed to stderr so they never break the request flow.
+
+    :param db_conn: Active database session.
+    :param eventType: The category of event being logged.
+    :param success: Whether the operation succeeded.
+    :param userID: Optional primary key of the acting user.
+    :param userEmail: Optional email of the acting user.
+    :param ipAddress: Optional client IP address.
+    :param device: Optional device / user-agent string.
+    :param description: Optional human-readable description of the event.
+    """
     try:
         db_conn.add(AuditLog(
             eventType=eventType,
diff --git a/server/utils/encryptor.py b/server/utils/encryptor.py
index 145204db..a5675d66 100644
--- a/server/utils/encryptor.py
+++ b/server/utils/encryptor.py
@@ -9,6 +9,13 @@
 
 
 def load_key():
+    """Load the AES-256 key from the ``DATA_CIPHER_KEY`` environment variable.
+
+    Supports both raw Base64-encoded (~44 chars) and direct 32-byte UTF-8 keys.
+
+    :return: A 32-byte key suitable for AES-256-GCM.
+    :raises RuntimeError: If the env var is missing, unparseable, or not 32 bytes.
+    """
     raw = os.getenv('DATA_CIPHER_KEY')
     if not raw:
         raise RuntimeError('Missing env DATA_CIPHER_KEY')
@@ -26,6 +33,15 @@ def load_key():
 
 
 def encrypt(plain_text):
+    """Encrypt plain-text with AES-256-GCM and return a versioned string.
+
+    Output format: ``v1:gcm:base64(iv):base64(tag):base64(cipher)``.
+    Accepts strings (encoded as UTF-8) or raw bytes. ``None`` is treated
+    as an empty string.
+
+    :param plain_text: The data to encrypt (``str`` or ``bytes``).
+    :return: A colon-delimited versioned cipher-text string.
+    """
     if plain_text is None:
         plain_text = ''
     if isinstance(plain_text, str):
@@ -46,6 +62,15 @@ def encrypt(plain_text):
 
 
 def decrypt(payload):
+    """Decrypt a versioned cipher-string produced by :func:`encrypt`.
+
+    Expects the ``v1:gcm:base64(iv):base64(tag):base64(cipher)`` format.
+    Validates IV length (12 bytes) and cipher format before decryption.
+
+    :param payload: The versioned cipher-string to decrypt.
+    :return: The original UTF-8 plain-text.
+    :raises RuntimeError: If the format, IV length, or authentication tag is invalid.
+    """
     if not isinstance(payload, str):
         raise RuntimeError('Cipher payload must be string')
     parts = payload.split(':')

From cec6cf71543584bf921c58af75d7f7887404cf0f Mon Sep 17 00:00:00 2001
From: Luke Bradley <bralc003@mymail.unisa.edu.au>
Date: Tue, 19 May 2026 20:36:10 +0930
Subject: [PATCH 034/105] Change api to include new lifestyle data and fix
 tests

---
 server/routers/health_prediction.py           | 76 +++++++++++++------
 .../tests/routers/test_health_prediction.py   | 76 ++++++++++---------
 2 files changed, 94 insertions(+), 58 deletions(-)

diff --git a/server/routers/health_prediction.py b/server/routers/health_prediction.py
index 4f9cfc80..7aa152f3 100644
--- a/server/routers/health_prediction.py
+++ b/server/routers/health_prediction.py
@@ -29,11 +29,12 @@ class HealthDataInput(CamelModel):
     hypertension: int
     heart_disease: int
     diabetes: int
-    alcohol: int
+    alcohol: str
     smoker: str
     marital_status: str
     working_status: str
     stroke: int
+    race: str
 
 
 class MerchantHealthDataInput(CamelModel):
@@ -48,11 +49,12 @@ class MerchantHealthDataInput(CamelModel):
     hypertension: int
     heart_disease: int
     diabetes: int
-    alcohol: int
+    alcohol: str
     smoker: str
     marital_status: str
     working_status: str
     stroke: int
+    race: str
     patient_id: int
 
 
@@ -64,13 +66,14 @@ class MerchantHealthDataInput(CamelModel):
 
 gender_map = {'Male': 1, 'Female': 0}
 smoker_map = {'No': 0, 'Yes': 1, 'Former smoker': 2}
-marital_map = {'Divorced': 0, 'Single': 0, 'Married': 1, 'Widow': 2}
+marital_map = {'Single': 0, 'Married': 1, 'Widow': 2, 'Divorced': 3}
 working_map = {
-    'Homemaker': 0, 'Unemployed': 0, 'Retired': 0,
-    'Private': 1, 'Self-employed': 1, 'Student': 2,
+    'Unemployed': 0, 'Homemaker': 1,
+    'Private': 1, 'Student': 2,
     'Working': 3, 'Public': 4
 }
-
+race_map = {'Malay': 0, 'Chinese': 1, 'Indian': 2, 'Other': 3}
+alcohol_map = {'Regular': 0, 'Occasional': 1, 'Non-drinker': 2}
 
 router = APIRouter()
 
@@ -109,6 +112,7 @@ async def predict(data: HealthDataInput, request: Request, db_conn: Session = De
     patient.Height = sanitized_data["height"]
     patient.set_marital_status(sanitized_data["marital_status"])
     patient.set_working_status(sanitized_data["working_status"])
+    patient.set_race(sanitized_data["race"])
 
     # Get the CSV patients's ID, otherwise uses the authenticated user's ID.
     patient_id = csv_patient_id if csv_patient_id is not None else patient.PatientID
@@ -122,15 +126,15 @@ async def predict(data: HealthDataInput, request: Request, db_conn: Session = De
         sanitized_data["ap_hi"],
         sanitized_data["ap_lo"],
         sanitized_data["high_cholesterol"],
-
         sanitized_data["hypertension"],
         sanitized_data["heart_disease"],
         sanitized_data["diabetes"],
-        sanitized_data["alcohol"],
+        alcohol_map[sanitized_data["alcohol"]],
         smoker_map[sanitized_data["smoker"]],
         marital_map[sanitized_data["marital_status"]],
         working_map[sanitized_data["working_status"]],
-        sanitized_data["stroke"])
+        sanitized_data["stroke"],
+        race_map[sanitized_data["race"]])
 
     # Store health data into the database
     db_conn.add(healthData)
@@ -149,7 +153,7 @@ async def predict(data: HealthDataInput, request: Request, db_conn: Session = De
         sanitized_data["high_cholesterol"],
         sanitized_data["blood_glucose"],
         smoker_map[sanitized_data["smoker"]],
-        sanitized_data["alcohol"]
+        alcohol_map[sanitized_data["alcohol"]]
     ]
     cardio_df = build_model_input_df(cardio_model, cardio_values)
     # Cardio prediction
@@ -311,7 +315,8 @@ async def upload_csv(request: Request, uploaded_file: UploadFile = File(...),
                 heart_disease=int(row["HeartDisease"]) if row.get(
                     "HeartDisease") else 0,
                 diabetes=int(row["Diabetes"]) if row.get("Diabetes") else 0,
-                alcohol=int(row["Alcohol"]) if row.get("Alcohol") else 0,
+                alcohol=str(row["Alcohol"]) if row.get(
+                    "Alcohol") else "",
                 smoker=str(row["SmokingStatus"]) if row.get(
                     "SmokingStatus") else "",
                 marital_status=str(row["MaritalStatus"]) if row.get(
@@ -319,6 +324,8 @@ async def upload_csv(request: Request, uploaded_file: UploadFile = File(...),
                 working_status=str(row["WorkingStatus"]) if row.get(
                     "WorkingStatus") else "",
                 stroke=int(row["Stroke"]) if row.get("Stroke") else 0,
+                race=str(row["Race"]) if row.get(
+                    "Race") else "",
                 patient_id=patient.PatientID
             )
             # Sanitize data before passing to merchant_predict
@@ -394,6 +401,7 @@ async def merchant_predict(data: MerchantHealthDataInput, request: Request, db_c
     patient.Height = sanitized_data["height"]
     patient.set_marital_status(sanitized_data["marital_status"])
     patient.set_working_status(sanitized_data["working_status"])
+    patient.set_race(sanitized_data["race"])
 
     # Check if the merchant has permission to view the patients record
     if (merchant_view_patient(merchant.UserID, patient.PatientID, db_conn) == False):
@@ -416,12 +424,24 @@ async def merchant_predict(data: MerchantHealthDataInput, request: Request, db_c
         BMI = (sanitized_data["weight"]/((sanitized_data["height"]/100)**2))
 
     # Get the CSV user's ID, otherwise uses the authenticated user's ID.
-    healthData = HealthData(patient.PatientID, sanitized_data["age"], sanitized_data["weight"], sanitized_data["height"], gender_map[sanitized_data["gender"]],
-                            sanitized_data["blood_glucose"], sanitized_data["ap_hi"], sanitized_data[
-                                "ap_lo"], sanitized_data["high_cholesterol"],
-                            sanitized_data["hypertension"], sanitized_data[
-                                "heart_disease"], sanitized_data["diabetes"], sanitized_data["alcohol"],
-                            smoker_map[sanitized_data["smoker"]],  marital_map[sanitized_data["marital_status"]], working_map[sanitized_data["working_status"]], sanitized_data["stroke"])
+    healthData = HealthData(patient.PatientID,
+                            sanitized_data["age"],
+                            sanitized_data["weight"],
+                            sanitized_data["height"],
+                            gender_map[sanitized_data["gender"]],
+                            sanitized_data["blood_glucose"],
+                            sanitized_data["ap_hi"],
+                            sanitized_data["ap_lo"],
+                            sanitized_data["high_cholesterol"],
+                            sanitized_data["hypertension"],
+                            sanitized_data["heart_disease"],
+                            sanitized_data["diabetes"],
+                            alcohol_map[sanitized_data["alcohol"]],
+                            smoker_map[sanitized_data["smoker"]],
+                            marital_map[sanitized_data["marital_status"]],
+                            working_map[sanitized_data["working_status"]],
+                            sanitized_data["stroke"],
+                            race_map[sanitized_data["race"]])
     # Store health data into the database
     db_conn.add(healthData)
     db_conn.commit()
@@ -439,7 +459,7 @@ async def merchant_predict(data: MerchantHealthDataInput, request: Request, db_c
         sanitized_data["high_cholesterol"],
         sanitized_data["blood_glucose"],
         smoker_map[sanitized_data["smoker"]],
-        sanitized_data["alcohol"]
+        alcohol_map[sanitized_data["alcohol"]]
     ]
     cardio_df = build_model_input_df(cardio_model, cardio_values)
     # Cardio prediction
@@ -584,8 +604,8 @@ def is_diabetes_valid(diabetes: int):
     return diabetes == 0 or diabetes == 1
 
 
-def is_alcohol_valid(alcohol: int):
-    return alcohol == 0 or alcohol == 1
+def is_alcohol_valid(alcohol: str):
+    return alcohol in alcohol_map
 
 
 def is_smoker_valid(smoker: str):
@@ -604,6 +624,10 @@ def is_stroke_valid(stroke: int):
     return stroke == 0 or stroke == 1
 
 
+def is_race_valid(race: str):
+    return race in race_map
+
+
 def sanitize_health_data(data: HealthDataInput):
     """
     Sanitise and normalize health data following phone sanitisation pattern.
@@ -636,6 +660,9 @@ def normalize_categorical(value, mapping, field_name):
         data.marital_status, marital_map, "marital_status")
     working_status = normalize_categorical(
         data.working_status, working_map, "working_status")
+    alcohol = normalize_categorical(
+        data.alcohol, alcohol_map, "alcohol")
+    race = normalize_categorical(data.race, race_map, "race")
 
     # Sanitize numeric fields (clamp to 2 decimal places)
     try:
@@ -660,11 +687,12 @@ def normalize_categorical(value, mapping, field_name):
         "hypertension": data.hypertension,
         "heart_disease": data.heart_disease,
         "diabetes": data.diabetes,
-        "alcohol": data.alcohol,
+        "alcohol": alcohol,
         "smoker": smoker,
         "marital_status": marital_status,
         "working_status": working_status,
         "stroke": data.stroke,
+        "race": race,
         "patient_id": getattr(data, 'patient_id', None)
     }
 
@@ -689,11 +717,13 @@ def validate_sanitized_data(sanitized_data: dict):
             not is_hyper_tension_valid(sanitized_data.get("hypertension")) or
             not is_heart_disease_valid(sanitized_data.get("heart_disease")) or
             not is_diabetes_valid(sanitized_data.get("diabetes")) or
-            not is_alcohol_valid(sanitized_data.get("alcohol")) or
+            sanitized_data.get("alcohol") is None or sanitized_data.get("alcohol") not in alcohol_map or
             sanitized_data.get("smoker") is None or sanitized_data.get("smoker") not in smoker_map or
             sanitized_data.get("marital_status") is None or sanitized_data.get("marital_status") not in marital_map or
             sanitized_data.get("working_status") is None or sanitized_data.get("working_status") not in working_map or
-            not is_stroke_valid(sanitized_data.get("stroke"))):
+            not is_stroke_valid(sanitized_data.get("stroke")) or
+            sanitized_data.get("race") is None or sanitized_data.get("race") not in race_map):
+
         return False
 
     return True
diff --git a/server/tests/routers/test_health_prediction.py b/server/tests/routers/test_health_prediction.py
index dfaf97ab..6215cf3b 100644
--- a/server/tests/routers/test_health_prediction.py
+++ b/server/tests/routers/test_health_prediction.py
@@ -12,21 +12,21 @@
 client = TestClient(app)
 
 # Test CSV data.
-populated_rows = """GivenNames,LastName,Email,PhoneNumber,Age,WeightKilograms,HeightCentimetres,Gender,BloodGlucose,APHigh,APLow,HighCholesterol,HyperTension,HeartDisease,Diabetes,Alcohol,SmokingStatus,MaritalStatus,WorkingStatus,Stroke
-User,1,user1@example.com,0412345678,31,50,170,Male,4.5,135,120,1,1,0,1,0,Yes,Single,Private,1
-User,2,user2@example.com,0812345678,31,60,170,Male,6,140,120,0,1,0,0,1,No,Married,Private,0"""
+populated_rows = """GivenNames,LastName,Email,PhoneNumber,Age,WeightKilograms,HeightCentimetres,Gender,BloodGlucose,APHigh,APLow,HighCholesterol,HyperTension,HeartDisease,Diabetes,Alcohol,SmokingStatus,MaritalStatus,WorkingStatus,Stroke,Race
+User,1,user1@example.com,0412345678,31,50,170,Male,4.5,135,120,1,1,0,1,Regular,Yes,Single,Private,1,Malay
+User,2,user2@example.com,0812345678,31,60,170,Male,6,140,120,0,1,0,0,Regular,No,Married,Private,0,Chinese"""
 
-unpopulated_rows = """GivenNames,LastName,Email,PhoneNumber,Age,WeightKilograms,HeightCentimetres,Gender,BloodGlucose,APHigh,APLow,HighCholesterol,HyperTension,HeartDisease,Diabetes,Alcohol,SmokingStatus,MaritalStatus,WorkingStatus,Stroke
+unpopulated_rows = """GivenNames,LastName,Email,PhoneNumber,Age,WeightKilograms,HeightCentimetres,Gender,BloodGlucose,APHigh,APLow,HighCholesterol,HyperTension,HeartDisease,Diabetes,Alcohol,SmokingStatus,MaritalStatus,WorkingStatus,Stroke,Race
 ,,,,,,,,,,,,,,,,,,,
 ,,,,,,,,,,,,,,,,,,,"""
 
-one_populated_row = """GivenNames,LastName,Email,PhoneNumber,Age,WeightKilograms,HeightCentimetres,Gender,BloodGlucose,APHigh,APLow,HighCholesterol,HyperTension,HeartDisease,Diabetes,Alcohol,SmokingStatus,MaritalStatus,WorkingStatus,Stroke
+one_populated_row = """GivenNames,LastName,Email,PhoneNumber,Age,WeightKilograms,HeightCentimetres,Gender,BloodGlucose,APHigh,APLow,HighCholesterol,HyperTension,HeartDisease,Diabetes,Alcohol,SmokingStatus,MaritalStatus,WorkingStatus,Stroke,Race
 ,,,,,,,,,,,,,,,,,,,
-User,2,user2@example.com,0812345678,31,60,170,Male,6,140,120,0,1,0,0,1,No,Married,Private,0"""
+User,2,user2@example.com,0812345678,31,60,170,Male,6,140,120,0,1,0,0,Regular,No,Married,Private,0,Malay"""
 
-missing_email = """GivenNames,LastName,Email,PhoneNumber,Age,WeightKilograms,HeightCentimetres,Gender,BloodGlucose,APHigh,APLow,HighCholesterol,HyperTension,HeartDisease,Diabetes,Alcohol,SmokingStatus,MaritalStatus,WorkingStatus,Stroke
-User,1,user1@example.com,0412345678,31,50,170,Male,4.5,135,120,1,1,0,1,0,Yes,Single,Private,1
-User,2,,0812345678,31,60,170,Male,6,140,120,0,1,0,0,1,No,Married,Private,0"""
+missing_email = """GivenNames,LastName,Email,PhoneNumber,Age,WeightKilograms,HeightCentimetres,Gender,BloodGlucose,APHigh,APLow,HighCholesterol,HyperTension,HeartDisease,Diabetes,Alcohol,SmokingStatus,MaritalStatus,WorkingStatus,Stroke,Race
+User,1,user1@example.com,0412345678,31,50,170,Male,4.5,135,120,1,1,0,1,Regular,Yes,Single,Private,1,Malay
+User,2,,0812345678,31,60,170,Male,6,140,120,0,1,0,0,Regular,No,Married,Private,0,Malay"""
 
 
 @pytest.fixture(scope="session", autouse=True)
@@ -257,8 +257,8 @@ def test_sanitize_whitespace_in_gender(self):
             age=30, weight=75.0, height=170.0, gender=" Male ",
             blood_glucose=5.5, ap_hi=120, ap_lo=80,
             high_cholesterol=0, hypertension=0, heart_disease=0,
-            diabetes=0, alcohol=0,
-            smoker="Yes", marital_status="Married", working_status="Private", stroke=0
+            diabetes=0, alcohol="Regular",
+            smoker="Yes", marital_status="Married", working_status="Private", stroke=0, race="Malay"
         )
         result = sanitize_health_data(data)
         assert result is not None
@@ -270,8 +270,8 @@ def test_sanitize_case_insensitive_gender(self):
             age=30, weight=75.0, height=170.0, gender="female",
             blood_glucose=5.5, ap_hi=120, ap_lo=80,
             high_cholesterol=0, hypertension=0, heart_disease=0,
-            diabetes=0, alcohol=0,
-            smoker="Yes", marital_status="Married", working_status="Private", stroke=0
+            diabetes=0, alcohol="Regular",
+            smoker="Yes", marital_status="Married", working_status="Private", stroke=0, race="Malay"
         )
         result = sanitize_health_data(data)
         assert result is not None
@@ -283,8 +283,8 @@ def test_sanitize_case_insensitive_smoker(self):
             age=30, weight=75.0, height=170.0, gender="Male",
             blood_glucose=5.5, ap_hi=120, ap_lo=80,
             high_cholesterol=0, hypertension=0, heart_disease=0,
-            diabetes=0, alcohol=0,
-            smoker="NO", marital_status="Married", working_status="Private", stroke=0
+            diabetes=0, alcohol="Regular",
+            smoker="NO", marital_status="Married", working_status="Private", stroke=0, race="Malay"
         )
         result = sanitize_health_data(data)
         assert result is not None
@@ -296,8 +296,8 @@ def test_sanitize_former_smoker_with_spaces(self):
             age=30, weight=75.0, height=170.0, gender="Male",
             blood_glucose=5.5, ap_hi=120, ap_lo=80,
             high_cholesterol=0, hypertension=0, heart_disease=0,
-            diabetes=0, alcohol=0,
-            smoker="  FORMER SMOKER  ", marital_status="Married", working_status="Private", stroke=0
+            diabetes=0, alcohol="Regular",
+            smoker="  FORMER SMOKER  ", marital_status="Married", working_status="Private", stroke=0, race="Malay"
         )
         result = sanitize_health_data(data)
         assert result is not None
@@ -309,8 +309,8 @@ def test_sanitize_decimal_precision_clamping(self):
             age=30, weight=75.12345, height=170.6789, gender="Male",
             blood_glucose=5.6789, ap_hi=120.123, ap_lo=80.999,
             high_cholesterol=0, hypertension=0, heart_disease=0,
-            diabetes=0, alcohol=0,
-            smoker="Yes", marital_status="Married", working_status="Private", stroke=0
+            diabetes=0, alcohol="Regular",
+            smoker="Yes", marital_status="Married", working_status="Private", stroke=0, race="Malay"
         )
         result = sanitize_health_data(data)
         assert result is not None
@@ -326,8 +326,8 @@ def test_sanitize_invalid_gender_returns_none(self):
             age=30, weight=75.0, height=170.0, gender="InvalidGender",
             blood_glucose=5.5, ap_hi=120, ap_lo=80,
             high_cholesterol=0, hypertension=0, heart_disease=0,
-            diabetes=0, alcohol=0,
-            smoker="Yes", marital_status="Married", working_status="Private", stroke=0
+            diabetes=0, alcohol="Regular",
+            smoker="Yes", marital_status="Married", working_status="Private", stroke=0, race="Malay"
         )
         result = sanitize_health_data(data)
         assert result is not None
@@ -339,8 +339,8 @@ def test_sanitize_case_insensitive_marital_status(self):
             age=30, weight=75.0, height=170.0, gender="Male",
             blood_glucose=5.5, ap_hi=120, ap_lo=80,
             high_cholesterol=0, hypertension=0, heart_disease=0,
-            diabetes=0, alcohol=0,
-            smoker="Yes", marital_status="  MARRIED  ", working_status="Private", stroke=0
+            diabetes=0, alcohol="Regular",
+            smoker="Yes", marital_status="  MARRIED  ", working_status="Private", stroke=0, race="Malay"
         )
         result = sanitize_health_data(data)
         assert result is not None
@@ -364,11 +364,12 @@ def test_validate_valid_sanitized_data(self):
             "hypertension": 0,
             "heart_disease": 0,
             "diabetes": 0,
-            "alcohol": 0,
+            "alcohol": "Regular",
             "smoker": "Yes",
             "marital_status": "Married",
             "working_status": "Private",
             "stroke": 0,
+            "race": "Malay",
             "patient_id": None
         }
         assert validate_sanitized_data(sanitized) is True
@@ -387,11 +388,12 @@ def test_validate_rejects_none_gender(self):
             "hypertension": 0,
             "heart_disease": 0,
             "diabetes": 0,
-            "alcohol": 0,
+            "alcohol": "Regular",
             "smoker": "Yes",
             "marital_status": "Married",
             "working_status": "Private",
             "stroke": 0,
+            "race": "Malay",
             "patient_id": None
         }
         assert validate_sanitized_data(sanitized) is False
@@ -410,11 +412,12 @@ def test_validate_rejects_none_smoker(self):
             "hypertension": 0,
             "heart_disease": 0,
             "diabetes": 0,
-            "alcohol": 0,
+            "alcohol": "Regular",
             "smoker": None,  # Invalid
             "marital_status": "Married",
             "working_status": "Private",
             "stroke": 0,
+            "race": "Malay",
             "patient_id": None
         }
         assert validate_sanitized_data(sanitized) is False
@@ -433,11 +436,12 @@ def test_validate_rejects_out_of_range_age(self):
             "hypertension": 0,
             "heart_disease": 0,
             "diabetes": 0,
-            "alcohol": 0,
+            "alcohol": "Regular",
             "smoker": "Yes",
             "marital_status": "Married",
             "working_status": "Private",
             "stroke": 0,
+            "race": "Malay",
             "patient_id": None
         }
         assert validate_sanitized_data(sanitized) is False
@@ -468,11 +472,12 @@ def test_healthprediction_with_lowercase_gender(self):
             "hypertension": 0,
             "heart_disease": 0,
             "diabetes": 0,
-            "alcohol": 0,
+            "alcohol": "Regular",
             "smoker": "Yes",
             "marital_status": "Married",
             "working_status": "Private",
-            "stroke": 0
+            "stroke": 0,
+            "race": "Malay",
         }
 
         response = client.post("/health-prediction/", json=health_data)
@@ -500,11 +505,12 @@ def test_healthprediction_with_whitespace_smoker(self):
             "hypertension": 0,
             "heart_disease": 0,
             "diabetes": 0,
-            "alcohol": 0,
+            "alcohol": "Regular",
             "smoker": "  No  ",  # whitespace
             "marital_status": "Married",
             "working_status": "Private",
-            "stroke": 0
+            "stroke": 0,
+            "race": "Malay"
         }
 
         response = client.post("/health-prediction/", json=health_data)
@@ -527,8 +533,8 @@ def ensure_merchant_login(self):
 
     def test_csv_upload_with_case_variations(self):
         """CSV upload handles case variations in categorical fields."""
-        csv_data = """GivenNames,LastName,Email,PhoneNumber,Age,WeightKilograms,HeightCentimetres,Gender,BloodGlucose,APHigh,APLow,HighCholesterol,HyperTension,HeartDisease,Diabetes,Alcohol,SmokingStatus,MaritalStatus,WorkingStatus,Stroke
-User,3,user1@example.com,0412345678,31,50,170,male,4.5,135,120,1,1,0,1,0,no,single,private,1"""
+        csv_data = """GivenNames,LastName,Email,PhoneNumber,Age,WeightKilograms,HeightCentimetres,Gender,BloodGlucose,APHigh,APLow,HighCholesterol,HyperTension,HeartDisease,Diabetes,Alcohol,SmokingStatus,MaritalStatus,WorkingStatus,Stroke,Race
+User,3,user1@example.com,0412345678,31,50,170,male,4.5,135,120,1,1,0,1,Regular,no,single,private,1,Malay"""
 
         pre_count = count_health_data()
         response = upload_csv(csv_data)
@@ -541,8 +547,8 @@ def test_csv_upload_with_case_variations(self):
 
     def test_csv_upload_with_invalid_gender_skipped(self):
         """CSV upload skips rows with invalid gender after attempted sanitization."""
-        csv_data = """GivenNames,LastName,Email,PhoneNumber,Age,WeightKilograms,HeightCentimetres,Gender,BloodGlucose,APHigh,APLow,HighCholesterol,HyperTension,HeartDisease,Diabetes,Alcohol,SmokingStatus,MaritalStatus,WorkingStatus,Stroke
-User,4,user1@example.com,0412345678,31,50,170,InvalidGender,4.5,135,120,1,1,0,1,0,Yes,Single,Private,1"""
+        csv_data = """GivenNames,LastName,Email,PhoneNumber,Age,WeightKilograms,HeightCentimetres,Gender,BloodGlucose,APHigh,APLow,HighCholesterol,HyperTension,HeartDisease,Diabetes,Alcohol,SmokingStatus,MaritalStatus,WorkingStatus,Stroke,Race
+User,4,user1@example.com,0412345678,31,50,170,InvalidGender,4.5,135,120,1,1,0,1,Regular,Yes,Single,Private,1,Malay"""
 
         pre_count = count_health_data()
         response = upload_csv(csv_data)

From e23dd2ba91794976d94ffe733ef3b5057e3e1a8c Mon Sep 17 00:00:00 2001
From: wyl2003 <108109393+wyl2003@users.noreply.github.com>
Date: Tue, 19 May 2026 20:50:36 +0930
Subject: [PATCH 035/105] doc: add docstring for main.py

---
 server/main.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/server/main.py b/server/main.py
index 52a10c07..14969994 100644
--- a/server/main.py
+++ b/server/main.py
@@ -1,3 +1,9 @@
+"""FastAPI application entry point for the Smart Health Predictive API.
+
+Includes router modules for health predictions, authentication, user
+management, and admin operations. CORS is configured from environment
+variable ``CORS_ORIGINS`` or a default set of development origins.
+"""
 import os
 
 from fastapi import FastAPI
@@ -31,6 +37,7 @@
 
 @app.get("/")
 async def root():
+    """Health-check endpoint; returns a simple greeting."""
     return {"message": "Hello World"}
 
 app.include_router(health_prediction.router)

From 06e2b35b6137cbc403e7756c7e04741f3528c0aa Mon Sep 17 00:00:00 2001
From: Luke Bradley <bralc003@mymail.unisa.edu.au>
Date: Tue, 19 May 2026 21:23:30 +0930
Subject: [PATCH 036/105] Update generate report form for standard user

Add new lifestyle options to generate report
---
 client/src/components/GenerateReportForm.js | 168 ++++++++++++++------
 server/models/dbmodels.py                   |  20 ++-
 server/routers/health_prediction.py         |   5 +-
 server/routers/users.py                     |   1 +
 4 files changed, 140 insertions(+), 54 deletions(-)

diff --git a/client/src/components/GenerateReportForm.js b/client/src/components/GenerateReportForm.js
index 8b46aaa1..89c55d4f 100644
--- a/client/src/components/GenerateReportForm.js
+++ b/client/src/components/GenerateReportForm.js
@@ -28,6 +28,7 @@ const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
 const GenerateReportForm = () => {
   const navigate = useNavigate();
 
+  // Options for each drop down input. This can be modified as required to change the input for each selection
   const healthConditions = [
     "Hyper Tension",
     "Heart Disease",
@@ -35,7 +36,21 @@ const GenerateReportForm = () => {
     "High Cholesterol",
     "Stroke",
   ];
-  const lifeStyleChoices = ["Drink Alcohol", "Current Smoker", "Former Smoker"];
+
+  const smokerOptions = ["No", "Yes", "Former smoker"];
+
+  const maritalStatusOptions = ["Single", "Married", "Widow", "Divorced"];
+
+  const workingStatusOptions = [
+    "Unemployed",
+    "Homemaker",
+    "Student",
+    "Working",
+  ];
+
+  const raceOptions = ["Malay", "Chinese", "Indian", "Other"];
+
+  const alcoholOptions = ["Regular", "Occasional", "Non-drinker"];
 
   const ITEM_HEIGHT = 48;
   const ITEM_PADDING_TOP = 8;
@@ -73,6 +88,12 @@ const GenerateReportForm = () => {
   const [alertWorkingStatusRequired, setAlertWorkingStatusRequired] =
     useState(false);
   const [bloodGlucoseInput, setBloodGlucoseInput] = useState("");
+  const [race, setRace] = useState("");
+  const [alertRaceRequired, setAlertRaceRequired] = useState(false);
+  const [smoker, setSmoker] = useState("");
+  const [alertSmokerRequired, setAlertSmokerRequired] = useState(false);
+  const [alcohol, setAlcohol] = useState("");
+  const [alertAlcoholRequired, setAlertAlcoholRequired] = useState(false);
 
   const [isLoading, setIsLoading] = useState(false);
 
@@ -94,6 +115,7 @@ const GenerateReportForm = () => {
         setAge({ isValid: true, value: data.age });
         setMaritalStatus(data.maritalStatus);
         setWorkingStatus(data.workingStatus);
+        setRace(data.race);
       } catch (err) {
         console.log("Failed to fetch patient data.");
       }
@@ -202,6 +224,19 @@ const GenerateReportForm = () => {
     setAlertWorkingStatusRequired(false);
   }
 
+  function updateRace(e) {
+    setRace(e.target.value);
+    setAlertRaceRequired(false);
+  }
+  function updateSmoker(e) {
+    setSmoker(e.target.value);
+    setAlertSmokerRequired(false);
+  }
+  function updateAlcohol(e) {
+    setAlcohol(e.target.value);
+    setAlertAlcoholRequired(false);
+  }
+
   function isAllInputsValid() {
     return (
       weight !== null &&
@@ -217,8 +252,11 @@ const GenerateReportForm = () => {
       apLow.isValid &&
       apHigh !== null &&
       apHigh.isValid &&
-      maritalStatus !== null &&
-      workingStatus !== null
+      maritalStatus !== "" &&
+      workingStatus !== "" &&
+      race !== "" &&
+      smoker !== "" &&
+      alcohol !== ""
     );
   }
   function updateAllInputFieldAlerts() {
@@ -233,6 +271,9 @@ const GenerateReportForm = () => {
     setAlertApHighRequired(apHigh === null || !apHigh.isValid);
     setAlertMaritalStatusRequired(maritalStatus === null);
     setAlertWorkingStatusRequired(workingStatus === null);
+    setAlertRaceRequired(race === null);
+    setAlertSmokerRequired(smoker === "");
+    setAlertAlcoholRequired(alcohol === "");
   }
 
   // Fills in fields with information found in the blood reports.
@@ -270,14 +311,6 @@ const GenerateReportForm = () => {
     const highCholesterol = condition.includes("High Cholesterol") ? 1 : 0;
     const stroke = condition.includes("Stroke") ? 1 : 0;
 
-    // Get lifestyle values for fetch request
-    const alcohol = lifeStyle.includes("Drink Alcohol") ? 1 : 0;
-    const smoker = lifeStyle.includes("Current Smoker")
-      ? "Yes"
-      : lifeStyle.includes("Former Smoker")
-        ? "Former smoker"
-        : "No";
-
     // Fetch request for AI Model
     await fetch(`${API_BASE}/health-prediction`, {
       method: "POST",
@@ -302,10 +335,12 @@ const GenerateReportForm = () => {
         maritalStatus: maritalStatus,
         workingStatus: workingStatus,
         stroke: stroke,
+        race: race,
       }),
     })
       .then((response) => {
         if (!response.ok) {
+          setIsLoading(false);
           throw new Error(response.status);
         }
         setIsLoading(false);
@@ -566,41 +601,53 @@ const GenerateReportForm = () => {
               gap: 3,
             }}
           >
-            <FormControl fullWidth>
-              <InputLabel id="life-style">
-                Life Style Habits (if any)
-              </InputLabel>
+            {/* Smoking Status Selection */}
+            <FormControl error={alertSmokerRequired}>
+              <InputLabel id="smoker-label">Smoking Status</InputLabel>
+
               <Select
-                labelId="life-style-label"
-                id="life-style-checkbox"
-                multiple
-                value={lifeStyle}
-                onChange={handleChangeLifeStyle}
-                input={<OutlinedInput label="Life Style Habits (if any)" />}
-                renderValue={(selected) => selected.join(", ")}
-                MenuProps={MenuProps}
+                labelId="smoker-label"
+                id="smoker-required"
+                value={smoker}
+                label="Smoking Status"
+                onChange={updateSmoker}
               >
-                {lifeStyleChoices.map((name) => {
-                  const selected = lifeStyle.includes(name);
-                  const SelectionIcon = selected
-                    ? CheckBoxIcon
-                    : CheckBoxOutlineBlankIcon;
+                {smokerOptions.map((option) => (
+                  <MenuItem key={option} value={option}>
+                    {option}
+                  </MenuItem>
+                ))}
+              </Select>
 
-                  return (
-                    <MenuItem key={name} value={name}>
-                      <SelectionIcon
-                        fontSize="small"
-                        style={{
-                          marginRight: 8,
-                          padding: 9,
-                          boxSizing: "content-box",
-                        }}
-                      />
-                      <ListItemText primary={name} />
-                    </MenuItem>
-                  );
-                })}
+              {alertSmokerRequired && (
+                <FormHelperText>
+                  *Please enter your smoking status
+                </FormHelperText>
+              )}
+            </FormControl>
+            {/* Alcohol Status Selection */}
+            <FormControl error={alertAlcoholRequired}>
+              <InputLabel id="alcohol-label">Alcohol Consumption</InputLabel>
+
+              <Select
+                labelId="alcohol-label"
+                id="alcohol-required"
+                value={alcohol}
+                label="Alcohol Consumption"
+                onChange={updateAlcohol}
+              >
+                {alcoholOptions.map((option) => (
+                  <MenuItem key={option} value={option}>
+                    {option}
+                  </MenuItem>
+                ))}
               </Select>
+
+              {alertAlcoholRequired && (
+                <FormHelperText>
+                  *Please enter your alcohol consumption
+                </FormHelperText>
+              )}
             </FormControl>
 
             {/* Marital Status Selection */}
@@ -613,8 +660,11 @@ const GenerateReportForm = () => {
                 onChange={updateMaritalStatus}
                 label="Marital Status"
               >
-                <MenuItem value={"Single"}>Single</MenuItem>
-                <MenuItem value={"Married"}>Married</MenuItem>
+                {maritalStatusOptions.map((option) => (
+                  <MenuItem key={option} value={option}>
+                    {option}
+                  </MenuItem>
+                ))}
               </Select>
               {alertMaritalStatusRequired && (
                 <FormHelperText>
@@ -632,10 +682,11 @@ const GenerateReportForm = () => {
                 label="Working Status"
                 onChange={updateWorkingStatus}
               >
-                <MenuItem value={"Unemployed"}>Unemployed</MenuItem>
-                <MenuItem value={"Private"}>Private</MenuItem>
-                <MenuItem value={"Student"}>Student</MenuItem>
-                <MenuItem value={"Public"}>Public</MenuItem>
+                {workingStatusOptions.map((option) => (
+                  <MenuItem key={option} value={option}>
+                    {option}
+                  </MenuItem>
+                ))}
               </Select>
               {alertWorkingStatusRequired && (
                 <FormHelperText>
@@ -643,6 +694,27 @@ const GenerateReportForm = () => {
                 </FormHelperText>
               )}
             </FormControl>
+            <FormControl error={alertRaceRequired}>
+              <InputLabel id="race-label">Race</InputLabel>
+
+              <Select
+                labelId="race-label"
+                id="race-required"
+                value={race}
+                label="Race"
+                onChange={updateRace}
+              >
+                {raceOptions.map((option) => (
+                  <MenuItem key={option} value={option}>
+                    {option}
+                  </MenuItem>
+                ))}
+              </Select>
+
+              {alertRaceRequired && (
+                <FormHelperText>*Please enter your race</FormHelperText>
+              )}
+            </FormControl>
           </Box>
 
           <Box sx={{ display: "flex", justifyContent: "end" }}>
diff --git a/server/models/dbmodels.py b/server/models/dbmodels.py
index 66515d0d..4384c9ca 100644
--- a/server/models/dbmodels.py
+++ b/server/models/dbmodels.py
@@ -5,13 +5,15 @@
 MARITAL_STATUS_OPTIONS = {
     0: 'Single',
     1: 'Married',
+    2: 'Widow',
+    3: 'Divorced'
 }
 
 WORKING_STATUS_OPTIONS = {
     0: 'Unemployed',
-    1: 'Private',
+    1: 'Homemaker',
     2: 'Student',
-    3: 'Public',
+    3: 'Working',
 }
 
 RACE_OPTIONS = {
@@ -21,6 +23,18 @@
     3: 'Other'
 }
 
+SMOKER_OPTIONS = {
+    0: 'No',
+    1: 'Yes',
+    2: 'Former smoker'
+}
+
+ALCOHOL_OPTIONS = {
+    0: 'Regular',
+    1: 'Occasional',
+    2: 'Non-drinker'
+}
+
 Base = declarative_base()
 
 
@@ -194,7 +208,7 @@ def get_working_status(self):
         """Returns working status as a string."""
         return WORKING_STATUS_OPTIONS.get(self.WorkingStatus)
 
-    def get_working_status(self):
+    def get_race(self):
         """Returns race as a string."""
         return RACE_OPTIONS.get(self.Race)
 
diff --git a/server/routers/health_prediction.py b/server/routers/health_prediction.py
index 7aa152f3..4ac4c47b 100644
--- a/server/routers/health_prediction.py
+++ b/server/routers/health_prediction.py
@@ -68,9 +68,8 @@ class MerchantHealthDataInput(CamelModel):
 smoker_map = {'No': 0, 'Yes': 1, 'Former smoker': 2}
 marital_map = {'Single': 0, 'Married': 1, 'Widow': 2, 'Divorced': 3}
 working_map = {
-    'Unemployed': 0, 'Homemaker': 1,
-    'Private': 1, 'Student': 2,
-    'Working': 3, 'Public': 4
+    'Unemployed': 0, 'Homemaker': 1, 'Student': 2,
+    'Working': 3
 }
 race_map = {'Malay': 0, 'Chinese': 1, 'Indian': 2, 'Other': 3}
 alcohol_map = {'Regular': 0, 'Occasional': 1, 'Non-drinker': 2}
diff --git a/server/routers/users.py b/server/routers/users.py
index dca52e97..d1b5f227 100644
--- a/server/routers/users.py
+++ b/server/routers/users.py
@@ -1015,6 +1015,7 @@ async def get_patient_data(request: Request, db_conn: Session = Depends(get_db))
         "age": get_age(patient.DateOfBirth),
         "maritalStatus": patient.get_marital_status(),
         "workingStatus": patient.get_working_status(),
+        "race": patient.get_race()
     }
 
     return result

From 55f9f8b6fc6a31822c1e07324274617977b86fc6 Mon Sep 17 00:00:00 2001
From: birjd002 <birjd002@mymail.unisa.edu.au>
Date: Tue, 19 May 2026 21:30:41 +0930
Subject: [PATCH 037/105] feat: include report creation time next to date text

---
 client/src/components/ReportTemplate.js |  2 +-
 client/src/routes/MerchantReports.js    | 25 +++++++++++++++----------
 client/src/routes/ReportHistory.js      |  3 +++
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/client/src/components/ReportTemplate.js b/client/src/components/ReportTemplate.js
index 9df107ab..596b8bb1 100644
--- a/client/src/components/ReportTemplate.js
+++ b/client/src/components/ReportTemplate.js
@@ -145,7 +145,7 @@ const ReportTemplate = ({ report, date }) => {
             mx: "auto",
           }}
         >
-          Generated on: {new Date(date).toLocaleDateString("en-AU")}
+          Generated on: {new Date(date).toLocaleDateString("en-AU")}{" at "}{`${new Date(date).toLocaleTimeString("en-AU")}`}
         </Typography>
       </Paper>
 
diff --git a/client/src/routes/MerchantReports.js b/client/src/routes/MerchantReports.js
index 5786f6fb..f5ee5b9d 100644
--- a/client/src/routes/MerchantReports.js
+++ b/client/src/routes/MerchantReports.js
@@ -287,17 +287,22 @@ const MerchantReports = ({}) => {
                 }}
               >
                 <ListItemText
-                  primary={`Report: ${new Date(item.date).toLocaleDateString("en-AU")}`}
-                  slotProps={{
-                    primary: {
-                      style: {
+                  primary={
+                    <Typography
+                      variant="h7"
+                      sx={{
                         fontWeight:
-                          selectedDate?.healthDataId === item.healthDataId
-                            ? 600
-                            : 400,
-                      },
-                    },
-                  }}
+                          selectedDate.healthDataId === item.healthDataId
+                            ? 400
+                            : 0,
+                      }}
+                    >
+                      {`Report: ${new Date(item.date).toLocaleDateString("en-AU")}`}
+                      <Typography variant="subtle">
+                          {" "}{`${new Date(item.date).toLocaleTimeString("en-AU")}`}
+                      </Typography>
+                    </Typography>
+                  }
                 />
                 {/* Delete Report Button */}
                 {selectedDate?.healthDataId === item.healthDataId && (
diff --git a/client/src/routes/ReportHistory.js b/client/src/routes/ReportHistory.js
index d50bbb00..3c35a642 100644
--- a/client/src/routes/ReportHistory.js
+++ b/client/src/routes/ReportHistory.js
@@ -265,6 +265,9 @@ const AIHealthPrediction = ({}) => {
                         }}
                       >
                         {`Report: ${new Date(item.date).toLocaleDateString("en-AU")}`}
+                        <Typography variant="subtle">
+                            {" "}{`${new Date(item.date).toLocaleTimeString("en-AU")}`}
+                        </Typography>
                       </Typography>
                     }
                   />

From 8683d9e8c5c1b2a2557cf417ad7c25f6849224b5 Mon Sep 17 00:00:00 2001
From: birjd002 <birjd002@mymail.unisa.edu.au>
Date: Tue, 19 May 2026 21:32:49 +0930
Subject: [PATCH 038/105] update: change relative time to display creation date

---
 client/src/routes/MerchantLanding.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/routes/MerchantLanding.js b/client/src/routes/MerchantLanding.js
index c253a142..fdb66cb1 100644
--- a/client/src/routes/MerchantLanding.js
+++ b/client/src/routes/MerchantLanding.js
@@ -209,7 +209,7 @@ const MerchantLanding = () => {
                 >
                   <Typography sx={{ flex: 1, pt: 1 }}>{a.message}</Typography>
                   <Typography sx={{ color: "#747474", whiteSpace: "nowrap" }}>
-                    {relativeTime(a.createdAt)}
+                    {new Date(a.createdAt).toLocaleDateString("en-AU")}
                   </Typography>
                 </Box>
               ))

From d49934c35f54ef96a85e8dd45a25a86ff3f63f5e Mon Sep 17 00:00:00 2001
From: Luke Bradley <bralc003@mymail.unisa.edu.au>
Date: Tue, 19 May 2026 21:34:45 +0930
Subject: [PATCH 039/105] Update merchant report generation form

---
 client/src/components/GenerateReportForm.js |   9 +-
 client/src/components/MerchantReportForm.js | 170 ++++++++++++++------
 2 files changed, 123 insertions(+), 56 deletions(-)

diff --git a/client/src/components/GenerateReportForm.js b/client/src/components/GenerateReportForm.js
index 89c55d4f..a32514b1 100644
--- a/client/src/components/GenerateReportForm.js
+++ b/client/src/components/GenerateReportForm.js
@@ -269,9 +269,9 @@ const GenerateReportForm = () => {
     );
     setAlertApLowRequired(apLow === null || !apLow.isValid);
     setAlertApHighRequired(apHigh === null || !apHigh.isValid);
-    setAlertMaritalStatusRequired(maritalStatus === null);
-    setAlertWorkingStatusRequired(workingStatus === null);
-    setAlertRaceRequired(race === null);
+    setAlertMaritalStatusRequired(maritalStatus === "");
+    setAlertWorkingStatusRequired(workingStatus === "");
+    setAlertRaceRequired(race === "");
     setAlertSmokerRequired(smoker === "");
     setAlertAlcoholRequired(alcohol === "");
   }
@@ -581,9 +581,6 @@ const GenerateReportForm = () => {
               }
             />
           </Box>
-
-          {/*Multi-select LifeStyle Habits */}
-
           <Typography
             variant="h4"
             sx={{
diff --git a/client/src/components/MerchantReportForm.js b/client/src/components/MerchantReportForm.js
index 94c62652..cdf350b4 100644
--- a/client/src/components/MerchantReportForm.js
+++ b/client/src/components/MerchantReportForm.js
@@ -52,6 +52,21 @@ const MerchantReportForm = () => {
   // List of lifestyle choices
   const lifeStyleChoices = ["Drink Alcohol", "Current Smoker", "Former Smoker"];
 
+  const smokerOptions = ["No", "Yes", "Former smoker"];
+
+  const maritalStatusOptions = ["Single", "Married", "Widow", "Divorced"];
+
+  const workingStatusOptions = [
+    "Unemployed",
+    "Homemaker",
+    "Student",
+    "Working",
+  ];
+
+  const raceOptions = ["Malay", "Chinese", "Indian", "Other"];
+
+  const alcoholOptions = ["Regular", "Occasional", "Non-drinker"];
+
   const ITEM_HEIGHT = 48;
   const ITEM_PADDING_TOP = 8;
   const MenuProps = {
@@ -89,7 +104,12 @@ const MerchantReportForm = () => {
   const [alertWorkingStatusRequired, setAlertWorkingStatusRequired] =
     useState(false);
   const [alertPatientRequired, setAlertPatientRequired] = useState(false);
-
+  const [race, setRace] = useState("");
+  const [alertRaceRequired, setAlertRaceRequired] = useState(false);
+  const [smoker, setSmoker] = useState("");
+  const [alertSmokerRequired, setAlertSmokerRequired] = useState(false);
+  const [alcohol, setAlcohol] = useState("");
+  const [alertAlcoholRequired, setAlertAlcoholRequired] = useState(false);
   const [isLoading, setIsLoading] = useState(false);
 
   // Retrieve Patient names
@@ -144,6 +164,7 @@ const MerchantReportForm = () => {
         setAge({ isValid: true, value: data.age });
         setMaritalStatus(data.maritalStatus);
         setWorkingStatus(data.workingStatus);
+        setRace(data.race);
       } catch (err) {
         console.log("Failed to fetch patient data.");
       }
@@ -251,6 +272,19 @@ const MerchantReportForm = () => {
     }
   }
 
+  function updateRace(e) {
+    setRace(e.target.value);
+    setAlertRaceRequired(false);
+  }
+  function updateSmoker(e) {
+    setSmoker(e.target.value);
+    setAlertSmokerRequired(false);
+  }
+  function updateAlcohol(e) {
+    setAlcohol(e.target.value);
+    setAlertAlcoholRequired(false);
+  }
+
   function isAllInputsValid() {
     return (
       weight !== null &&
@@ -266,8 +300,11 @@ const MerchantReportForm = () => {
       apLow.isValid &&
       apHigh !== null &&
       apHigh.isValid &&
-      maritalStatus !== null &&
-      workingStatus !== null &&
+      maritalStatus !== "" &&
+      workingStatus !== "" &&
+      race !== "" &&
+      smoker !== "" &&
+      alcohol !== "" &&
       selectedPatient !== null
     );
   }
@@ -281,9 +318,12 @@ const MerchantReportForm = () => {
     );
     setAlertApLowRequired(apLow === null || !apLow.isValid);
     setAlertApHighRequired(apHigh === null || !apHigh.isValid);
-    setAlertMaritalStatusRequired(maritalStatus === null);
-    setAlertWorkingStatusRequired(workingStatus === null);
+    setAlertMaritalStatusRequired(maritalStatus === "");
+    setAlertWorkingStatusRequired(workingStatus === "");
     setAlertPatientRequired(selectedPatient === null);
+    setAlertSmokerRequired(smoker === "");
+    setAlertAlcoholRequired(alcohol === "");
+    setAlertRaceRequired(race === "");
   }
 
   // Fills in fields with information found in the blood reports.
@@ -351,14 +391,6 @@ const MerchantReportForm = () => {
     const highCholesterol = condition.includes("High Cholesterol") ? 1 : 0;
     const stroke = condition.includes("Stroke") ? 1 : 0;
 
-    // Get lifestyle values for fetch request
-    const alcohol = lifeStyle.includes("Drink Alcohol") ? 1 : 0;
-    const smoker = lifeStyle.includes("Current Smoker")
-      ? "Yes"
-      : lifeStyle.includes("Former Smoker")
-        ? "Former smoker"
-        : "No";
-
     // Fetch request for AI Model
     await fetch(`${API_BASE}/merchant-health-prediction`, {
       method: "POST",
@@ -383,6 +415,7 @@ const MerchantReportForm = () => {
         maritalStatus: maritalStatus,
         workingStatus: workingStatus,
         stroke: stroke,
+        race: race,
         patientId: selectedPatient,
       }),
     })
@@ -722,41 +755,53 @@ const MerchantReportForm = () => {
               gap: 3,
             }}
           >
-            <FormControl fullWidth>
-              <InputLabel id="life-style">
-                Life Style Habits (if any)
-              </InputLabel>
+            {/* Smoking Status Selection */}
+            <FormControl error={alertSmokerRequired}>
+              <InputLabel id="smoker-label">Smoking Status</InputLabel>
+
               <Select
-                labelId="life-style-label"
-                id="life-style-checkbox"
-                multiple
-                value={lifeStyle}
-                onChange={handleChangeLifeStyle}
-                input={<OutlinedInput label="Life Style Habits (if any)" />}
-                renderValue={(selected) => selected.join(", ")}
-                MenuProps={MenuProps}
+                labelId="smoker-label"
+                id="smoker-required"
+                value={smoker}
+                label="Smoking Status"
+                onChange={updateSmoker}
               >
-                {lifeStyleChoices.map((name) => {
-                  const selected = lifeStyle.includes(name);
-                  const SelectionIcon = selected
-                    ? CheckBoxIcon
-                    : CheckBoxOutlineBlankIcon;
+                {smokerOptions.map((option) => (
+                  <MenuItem key={option} value={option}>
+                    {option}
+                  </MenuItem>
+                ))}
+              </Select>
 
-                  return (
-                    <MenuItem key={name} value={name}>
-                      <SelectionIcon
-                        fontSize="small"
-                        style={{
-                          marginRight: 8,
-                          padding: 9,
-                          boxSizing: "content-box",
-                        }}
-                      />
-                      <ListItemText primary={name} />
-                    </MenuItem>
-                  );
-                })}
+              {alertSmokerRequired && (
+                <FormHelperText>
+                  *Please enter your smoking status
+                </FormHelperText>
+              )}
+            </FormControl>
+            {/* Alcohol Status Selection */}
+            <FormControl error={alertAlcoholRequired}>
+              <InputLabel id="alcohol-label">Alcohol Consumption</InputLabel>
+
+              <Select
+                labelId="alcohol-label"
+                id="alcohol-required"
+                value={alcohol}
+                label="Alcohol Consumption"
+                onChange={updateAlcohol}
+              >
+                {alcoholOptions.map((option) => (
+                  <MenuItem key={option} value={option}>
+                    {option}
+                  </MenuItem>
+                ))}
               </Select>
+
+              {alertAlcoholRequired && (
+                <FormHelperText>
+                  *Please enter your alcohol consumption
+                </FormHelperText>
+              )}
             </FormControl>
 
             {/* Marital Status Selection */}
@@ -769,8 +814,11 @@ const MerchantReportForm = () => {
                 onChange={updateMaritalStatus}
                 label="Marital Status"
               >
-                <MenuItem value={"Single"}>Single</MenuItem>
-                <MenuItem value={"Married"}>Married</MenuItem>
+                {maritalStatusOptions.map((option) => (
+                  <MenuItem key={option} value={option}>
+                    {option}
+                  </MenuItem>
+                ))}
               </Select>
               {alertMaritalStatusRequired && (
                 <FormHelperText>
@@ -788,10 +836,11 @@ const MerchantReportForm = () => {
                 label="Working Status"
                 onChange={updateWorkingStatus}
               >
-                <MenuItem value={"Unemployed"}>Unemployed</MenuItem>
-                <MenuItem value={"Private"}>Private</MenuItem>
-                <MenuItem value={"Student"}>Student</MenuItem>
-                <MenuItem value={"Public"}>Public</MenuItem>
+                {workingStatusOptions.map((option) => (
+                  <MenuItem key={option} value={option}>
+                    {option}
+                  </MenuItem>
+                ))}
               </Select>
               {alertWorkingStatusRequired && (
                 <FormHelperText>
@@ -799,6 +848,27 @@ const MerchantReportForm = () => {
                 </FormHelperText>
               )}
             </FormControl>
+            <FormControl error={alertRaceRequired}>
+              <InputLabel id="race-label">Race</InputLabel>
+
+              <Select
+                labelId="race-label"
+                id="race-required"
+                value={race}
+                label="Race"
+                onChange={updateRace}
+              >
+                {raceOptions.map((option) => (
+                  <MenuItem key={option} value={option}>
+                    {option}
+                  </MenuItem>
+                ))}
+              </Select>
+
+              {alertRaceRequired && (
+                <FormHelperText>*Please enter your race</FormHelperText>
+              )}
+            </FormControl>
           </Box>
 
           <Box sx={{ display: "flex", justifyContent: "end", mt: 2 }}>

From 224c96421e8af885f7c4491a62f050f0aa181554 Mon Sep 17 00:00:00 2001
From: birjd002 <birjd002@mymail.unisa.edu.au>
Date: Tue, 19 May 2026 21:56:56 +0930
Subject: [PATCH 040/105] fix: add filtering by selectedYear before extracting
 months

---
 client/src/routes/MerchantReports.js | 4 +++-
 client/src/routes/ReportHistory.js   | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/client/src/routes/MerchantReports.js b/client/src/routes/MerchantReports.js
index 5786f6fb..414223e1 100644
--- a/client/src/routes/MerchantReports.js
+++ b/client/src/routes/MerchantReports.js
@@ -132,8 +132,10 @@ const MerchantReports = ({}) => {
   const years = [
     ...new Set(reportDates.map((r) => new Date(r.date).getFullYear())),
   ].sort((a, b) => a - b);
+
   const months = [
-    ...new Set(reportDates.map((r) => new Date(r.date).getMonth() + 1)),
+    ...new Set(reportDates.filter((r) => !selectedYear || new Date(r.date).getFullYear() === selectedYear,)
+    .map((r) => new Date(r.date).getMonth() + 1),),
   ].sort((a, b) => a - b);
 
   // Filters reports based on selected year and month if any.
diff --git a/client/src/routes/ReportHistory.js b/client/src/routes/ReportHistory.js
index d50bbb00..27728225 100644
--- a/client/src/routes/ReportHistory.js
+++ b/client/src/routes/ReportHistory.js
@@ -111,8 +111,10 @@ const AIHealthPrediction = ({}) => {
   const years = [
     ...new Set(reportDates.map((r) => new Date(r.date).getFullYear())),
   ].sort((a, b) => a - b);
+
   const months = [
-    ...new Set(reportDates.map((r) => new Date(r.date).getMonth() + 1)),
+    ...new Set(reportDates.filter((r) => !selectedYear || new Date(r.date).getFullYear() === selectedYear,)
+    .map((r) => new Date(r.date).getMonth() + 1),),
   ].sort((a, b) => a - b);
 
   // Filters reports based on selected year and month if any.

From 86fdcfbb392b47cf1663954219f6fe8f5d7cba6b Mon Sep 17 00:00:00 2001
From: birjd002 <birjd002@mymail.unisa.edu.au>
Date: Tue, 19 May 2026 22:02:13 +0930
Subject: [PATCH 041/105] update: reorder lifestyle section in ReportTemplate

---
 client/src/components/ReportTemplate.js | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/client/src/components/ReportTemplate.js b/client/src/components/ReportTemplate.js
index 9df107ab..9d6d2401 100644
--- a/client/src/components/ReportTemplate.js
+++ b/client/src/components/ReportTemplate.js
@@ -272,16 +272,6 @@ const ReportTemplate = ({ report, date }) => {
             p: 2,
           }}
         >
-          {/* Lifestyle */}
-          <Box>
-            <Typography variant={isMobile ? "h5" : "h4"} sx={{ mb: 1 }}>
-              Lifestyle Recommendations
-            </Typography>
-            <Typography variant="body1">
-              {report.lifestyleRecommendation ||
-                "No lifestyle recommendation available."}
-            </Typography>
-          </Box>
 
           {/* Exercise */}
           <Box>
@@ -304,6 +294,17 @@ const ReportTemplate = ({ report, date }) => {
             </Typography>
           </Box>
 
+          {/* Lifestyle */}
+          <Box>
+            <Typography variant={isMobile ? "h5" : "h4"} sx={{ mb: 1 }}>
+              Lifestyle Recommendations
+            </Typography>
+            <Typography variant="body1">
+              {report.lifestyleRecommendation ||
+                "No lifestyle recommendation available."}
+            </Typography>
+          </Box>
+
           {/* Diet to Avoid */}
           <Box>
             <Typography variant={isMobile ? "h5" : "h4"} sx={{ mb: 1 }}>

From 8bb9606459bb47b1ebdc40a8b586c5a96b4367e6 Mon Sep 17 00:00:00 2001
From: wyl2003 <108109393+wyl2003@users.noreply.github.com>
Date: Wed, 20 May 2026 17:46:19 +0930
Subject: [PATCH 042/105] doc: docstring consistency in health_predictin.py

---
 server/routers/health_prediction.py | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/server/routers/health_prediction.py b/server/routers/health_prediction.py
index c869c577..af29c172 100644
--- a/server/routers/health_prediction.py
+++ b/server/routers/health_prediction.py
@@ -645,12 +645,7 @@ def is_stroke_valid(stroke: int):
 
 
 def sanitize_health_data(data: HealthDataInput):
-    """
-    Sanitise and normalize health data following phone sanitisation pattern.
-    Handles whitespace trimming, case normalization for categorical values,
-    and decimal precision for numeric values.
-    Returns normalized dict or None if any field fails critical validation.
-    """
+    """Sanitise and normalise health data, returning a normalised dict or None if invalid."""
     def normalize_categorical(value, mapping, field_name):
         """Helper: case-insensitive lookup with fallback to None."""
         if not isinstance(value, str):
@@ -710,10 +705,7 @@ def normalize_categorical(value, mapping, field_name):
 
 
 def validate_sanitized_data(sanitized_data: dict):
-    """
-    Validates all sanitized/normalized data fields.
-    Returns True only if all fields are valid after sanitization.
-    """
+    """Validate all sanitised data fields; return True only if all are valid."""
     if sanitized_data is None:
         return False
 
@@ -740,9 +732,7 @@ def validate_sanitized_data(sanitized_data: dict):
 
 
 def validate_all_input(data: HealthDataInput):
-    """
-    Validates all user inputs
-    """
+    """Validate all user input fields; return True only if all are valid."""
     if (
             not is_age_valid(data.age) or
             not is_weight_valid(data.weight) or

From 86f93ecd855a07dd16f1de62db7f5263d278d56b Mon Sep 17 00:00:00 2001
From: Luke Bradley <bralc003@mymail.unisa.edu.au>
Date: Wed, 20 May 2026 19:45:21 +0930
Subject: [PATCH 043/105] Add retired option

---
 client/src/components/GenerateReportForm.js |  1 +
 server/models/dbmodels.py                   |  1 +
 server/routers/health_prediction.py         | 21 ++++++++++-----------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/client/src/components/GenerateReportForm.js b/client/src/components/GenerateReportForm.js
index a32514b1..7e0d4a10 100644
--- a/client/src/components/GenerateReportForm.js
+++ b/client/src/components/GenerateReportForm.js
@@ -46,6 +46,7 @@ const GenerateReportForm = () => {
     "Homemaker",
     "Student",
     "Working",
+    "Retired",
   ];
 
   const raceOptions = ["Malay", "Chinese", "Indian", "Other"];
diff --git a/server/models/dbmodels.py b/server/models/dbmodels.py
index 4384c9ca..1f431dad 100644
--- a/server/models/dbmodels.py
+++ b/server/models/dbmodels.py
@@ -14,6 +14,7 @@
     1: 'Homemaker',
     2: 'Student',
     3: 'Working',
+    4: 'Retired',
 }
 
 RACE_OPTIONS = {
diff --git a/server/routers/health_prediction.py b/server/routers/health_prediction.py
index 4ac4c47b..4700f579 100644
--- a/server/routers/health_prediction.py
+++ b/server/routers/health_prediction.py
@@ -14,9 +14,8 @@
 from .authentication import get_current_user, get_user, get_patient_by_email
 from ..utils.audit_log import write_audit_log
 
-# HealthData
-
 
+# HealthData
 class HealthDataInput(CamelModel):
     age: int
     weight: float           # kg
@@ -69,7 +68,7 @@ class MerchantHealthDataInput(CamelModel):
 marital_map = {'Single': 0, 'Married': 1, 'Widow': 2, 'Divorced': 3}
 working_map = {
     'Unemployed': 0, 'Homemaker': 1, 'Student': 2,
-    'Working': 3
+    'Working': 3, 'Retired': 4
 }
 race_map = {'Malay': 0, 'Chinese': 1, 'Indian': 2, 'Other': 3}
 alcohol_map = {'Regular': 0, 'Occasional': 1, 'Non-drinker': 2}
@@ -708,7 +707,7 @@ def validate_sanitized_data(sanitized_data: dict):
             not is_age_valid(sanitized_data.get("age")) or
             not is_weight_valid(sanitized_data.get("weight")) or
             not is_height_valid(sanitized_data.get("height")) or
-            sanitized_data.get("gender") is None or sanitized_data.get("gender") not in gender_map or
+            not is_gender_valid(sanitized_data.get("gender")) or
             not is_blood_glucose_valid(sanitized_data.get("blood_glucose")) or
             not is_ap_hi_valid(sanitized_data.get("ap_hi")) or
             not is_ap_lo_valid(sanitized_data.get("ap_lo")) or
@@ -716,12 +715,12 @@ def validate_sanitized_data(sanitized_data: dict):
             not is_hyper_tension_valid(sanitized_data.get("hypertension")) or
             not is_heart_disease_valid(sanitized_data.get("heart_disease")) or
             not is_diabetes_valid(sanitized_data.get("diabetes")) or
-            sanitized_data.get("alcohol") is None or sanitized_data.get("alcohol") not in alcohol_map or
-            sanitized_data.get("smoker") is None or sanitized_data.get("smoker") not in smoker_map or
-            sanitized_data.get("marital_status") is None or sanitized_data.get("marital_status") not in marital_map or
-            sanitized_data.get("working_status") is None or sanitized_data.get("working_status") not in working_map or
+            not is_alcohol_valid(sanitized_data.get("alcohol")) or
+            not is_smoker_valid(sanitized_data.get("smoker")) or
+            not is_marital_status_valid(sanitized_data.get("marital_status")) or
+            not is_working_status_valid(sanitized_data.get("working_status")) or
             not is_stroke_valid(sanitized_data.get("stroke")) or
-            sanitized_data.get("race") is None or sanitized_data.get("race") not in race_map):
+            not is_race_valid(sanitized_data.get("race"))):
 
         return False
 
@@ -748,8 +747,8 @@ def validate_all_input(data: HealthDataInput):
             not is_smoker_valid(data.smoker) or
             not is_marital_status_valid(data.marital_status) or
             not is_working_status_valid(data.working_status) or
-            not is_stroke_valid(data.stroke)):
-
+            not is_stroke_valid(data.stroke) or
+            not is_race_valid(data.race)):
         return False
 
     return True

From dede4fe0f470b255dedabcb2fd01ef4b3883ca60 Mon Sep 17 00:00:00 2001
From: Luke Bradley <bralc003@mymail.unisa.edu.au>
Date: Wed, 20 May 2026 19:49:35 +0930
Subject: [PATCH 044/105] Fix tests that were using invalid working status
 types

---
 .../tests/routers/test_health_prediction.py   | 40 +++++++++----------
 server/tests/routers/test_users.py            |  3 +-
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/server/tests/routers/test_health_prediction.py b/server/tests/routers/test_health_prediction.py
index 6215cf3b..001a6eeb 100644
--- a/server/tests/routers/test_health_prediction.py
+++ b/server/tests/routers/test_health_prediction.py
@@ -13,8 +13,8 @@
 
 # Test CSV data.
 populated_rows = """GivenNames,LastName,Email,PhoneNumber,Age,WeightKilograms,HeightCentimetres,Gender,BloodGlucose,APHigh,APLow,HighCholesterol,HyperTension,HeartDisease,Diabetes,Alcohol,SmokingStatus,MaritalStatus,WorkingStatus,Stroke,Race
-User,1,user1@example.com,0412345678,31,50,170,Male,4.5,135,120,1,1,0,1,Regular,Yes,Single,Private,1,Malay
-User,2,user2@example.com,0812345678,31,60,170,Male,6,140,120,0,1,0,0,Regular,No,Married,Private,0,Chinese"""
+User,1,user1@example.com,0412345678,31,50,170,Male,4.5,135,120,1,1,0,1,Regular,Yes,Single,Working,1,Malay
+User,2,user2@example.com,0812345678,31,60,170,Male,6,140,120,0,1,0,0,Regular,No,Married,Working,0,Chinese"""
 
 unpopulated_rows = """GivenNames,LastName,Email,PhoneNumber,Age,WeightKilograms,HeightCentimetres,Gender,BloodGlucose,APHigh,APLow,HighCholesterol,HyperTension,HeartDisease,Diabetes,Alcohol,SmokingStatus,MaritalStatus,WorkingStatus,Stroke,Race
 ,,,,,,,,,,,,,,,,,,,
@@ -22,11 +22,11 @@
 
 one_populated_row = """GivenNames,LastName,Email,PhoneNumber,Age,WeightKilograms,HeightCentimetres,Gender,BloodGlucose,APHigh,APLow,HighCholesterol,HyperTension,HeartDisease,Diabetes,Alcohol,SmokingStatus,MaritalStatus,WorkingStatus,Stroke,Race
 ,,,,,,,,,,,,,,,,,,,
-User,2,user2@example.com,0812345678,31,60,170,Male,6,140,120,0,1,0,0,Regular,No,Married,Private,0,Malay"""
+User,2,user2@example.com,0812345678,31,60,170,Male,6,140,120,0,1,0,0,Regular,No,Married,Working,0,Malay"""
 
 missing_email = """GivenNames,LastName,Email,PhoneNumber,Age,WeightKilograms,HeightCentimetres,Gender,BloodGlucose,APHigh,APLow,HighCholesterol,HyperTension,HeartDisease,Diabetes,Alcohol,SmokingStatus,MaritalStatus,WorkingStatus,Stroke,Race
-User,1,user1@example.com,0412345678,31,50,170,Male,4.5,135,120,1,1,0,1,Regular,Yes,Single,Private,1,Malay
-User,2,,0812345678,31,60,170,Male,6,140,120,0,1,0,0,Regular,No,Married,Private,0,Malay"""
+User,1,user1@example.com,0412345678,31,50,170,Male,4.5,135,120,1,1,0,1,Regular,Yes,Single,Working,1,Malay
+User,2,,0812345678,31,60,170,Male,6,140,120,0,1,0,0,Regular,No,Married,Working,0,Malay"""
 
 
 @pytest.fixture(scope="session", autouse=True)
@@ -258,7 +258,7 @@ def test_sanitize_whitespace_in_gender(self):
             blood_glucose=5.5, ap_hi=120, ap_lo=80,
             high_cholesterol=0, hypertension=0, heart_disease=0,
             diabetes=0, alcohol="Regular",
-            smoker="Yes", marital_status="Married", working_status="Private", stroke=0, race="Malay"
+            smoker="Yes", marital_status="Married", working_status="Working", stroke=0, race="Malay"
         )
         result = sanitize_health_data(data)
         assert result is not None
@@ -271,7 +271,7 @@ def test_sanitize_case_insensitive_gender(self):
             blood_glucose=5.5, ap_hi=120, ap_lo=80,
             high_cholesterol=0, hypertension=0, heart_disease=0,
             diabetes=0, alcohol="Regular",
-            smoker="Yes", marital_status="Married", working_status="Private", stroke=0, race="Malay"
+            smoker="Yes", marital_status="Married", working_status="Working", stroke=0, race="Malay"
         )
         result = sanitize_health_data(data)
         assert result is not None
@@ -284,7 +284,7 @@ def test_sanitize_case_insensitive_smoker(self):
             blood_glucose=5.5, ap_hi=120, ap_lo=80,
             high_cholesterol=0, hypertension=0, heart_disease=0,
             diabetes=0, alcohol="Regular",
-            smoker="NO", marital_status="Married", working_status="Private", stroke=0, race="Malay"
+            smoker="NO", marital_status="Married", working_status="Working", stroke=0, race="Malay"
         )
         result = sanitize_health_data(data)
         assert result is not None
@@ -297,7 +297,7 @@ def test_sanitize_former_smoker_with_spaces(self):
             blood_glucose=5.5, ap_hi=120, ap_lo=80,
             high_cholesterol=0, hypertension=0, heart_disease=0,
             diabetes=0, alcohol="Regular",
-            smoker="  FORMER SMOKER  ", marital_status="Married", working_status="Private", stroke=0, race="Malay"
+            smoker="  FORMER SMOKER  ", marital_status="Married", working_status="Working", stroke=0, race="Malay"
         )
         result = sanitize_health_data(data)
         assert result is not None
@@ -310,7 +310,7 @@ def test_sanitize_decimal_precision_clamping(self):
             blood_glucose=5.6789, ap_hi=120.123, ap_lo=80.999,
             high_cholesterol=0, hypertension=0, heart_disease=0,
             diabetes=0, alcohol="Regular",
-            smoker="Yes", marital_status="Married", working_status="Private", stroke=0, race="Malay"
+            smoker="Yes", marital_status="Married", working_status="Working", stroke=0, race="Malay"
         )
         result = sanitize_health_data(data)
         assert result is not None
@@ -327,7 +327,7 @@ def test_sanitize_invalid_gender_returns_none(self):
             blood_glucose=5.5, ap_hi=120, ap_lo=80,
             high_cholesterol=0, hypertension=0, heart_disease=0,
             diabetes=0, alcohol="Regular",
-            smoker="Yes", marital_status="Married", working_status="Private", stroke=0, race="Malay"
+            smoker="Yes", marital_status="Married", working_status="Working", stroke=0, race="Malay"
         )
         result = sanitize_health_data(data)
         assert result is not None
@@ -340,7 +340,7 @@ def test_sanitize_case_insensitive_marital_status(self):
             blood_glucose=5.5, ap_hi=120, ap_lo=80,
             high_cholesterol=0, hypertension=0, heart_disease=0,
             diabetes=0, alcohol="Regular",
-            smoker="Yes", marital_status="  MARRIED  ", working_status="Private", stroke=0, race="Malay"
+            smoker="Yes", marital_status="  MARRIED  ", working_status="Working", stroke=0, race="Malay"
         )
         result = sanitize_health_data(data)
         assert result is not None
@@ -367,7 +367,7 @@ def test_validate_valid_sanitized_data(self):
             "alcohol": "Regular",
             "smoker": "Yes",
             "marital_status": "Married",
-            "working_status": "Private",
+            "working_status": "Working",
             "stroke": 0,
             "race": "Malay",
             "patient_id": None
@@ -391,7 +391,7 @@ def test_validate_rejects_none_gender(self):
             "alcohol": "Regular",
             "smoker": "Yes",
             "marital_status": "Married",
-            "working_status": "Private",
+            "working_status": "Working",
             "stroke": 0,
             "race": "Malay",
             "patient_id": None
@@ -415,7 +415,7 @@ def test_validate_rejects_none_smoker(self):
             "alcohol": "Regular",
             "smoker": None,  # Invalid
             "marital_status": "Married",
-            "working_status": "Private",
+            "working_status": "Working",
             "stroke": 0,
             "race": "Malay",
             "patient_id": None
@@ -439,7 +439,7 @@ def test_validate_rejects_out_of_range_age(self):
             "alcohol": "Regular",
             "smoker": "Yes",
             "marital_status": "Married",
-            "working_status": "Private",
+            "working_status": "Working",
             "stroke": 0,
             "race": "Malay",
             "patient_id": None
@@ -475,7 +475,7 @@ def test_healthprediction_with_lowercase_gender(self):
             "alcohol": "Regular",
             "smoker": "Yes",
             "marital_status": "Married",
-            "working_status": "Private",
+            "working_status": "Working",
             "stroke": 0,
             "race": "Malay",
         }
@@ -508,7 +508,7 @@ def test_healthprediction_with_whitespace_smoker(self):
             "alcohol": "Regular",
             "smoker": "  No  ",  # whitespace
             "marital_status": "Married",
-            "working_status": "Private",
+            "working_status": "Working",
             "stroke": 0,
             "race": "Malay"
         }
@@ -534,7 +534,7 @@ def ensure_merchant_login(self):
     def test_csv_upload_with_case_variations(self):
         """CSV upload handles case variations in categorical fields."""
         csv_data = """GivenNames,LastName,Email,PhoneNumber,Age,WeightKilograms,HeightCentimetres,Gender,BloodGlucose,APHigh,APLow,HighCholesterol,HyperTension,HeartDisease,Diabetes,Alcohol,SmokingStatus,MaritalStatus,WorkingStatus,Stroke,Race
-User,3,user1@example.com,0412345678,31,50,170,male,4.5,135,120,1,1,0,1,Regular,no,single,private,1,Malay"""
+User,3,user1@example.com,0412345678,31,50,170,male,4.5,135,120,1,1,0,1,Regular,no,single,working,1,Malay"""
 
         pre_count = count_health_data()
         response = upload_csv(csv_data)
@@ -548,7 +548,7 @@ def test_csv_upload_with_case_variations(self):
     def test_csv_upload_with_invalid_gender_skipped(self):
         """CSV upload skips rows with invalid gender after attempted sanitization."""
         csv_data = """GivenNames,LastName,Email,PhoneNumber,Age,WeightKilograms,HeightCentimetres,Gender,BloodGlucose,APHigh,APLow,HighCholesterol,HyperTension,HeartDisease,Diabetes,Alcohol,SmokingStatus,MaritalStatus,WorkingStatus,Stroke,Race
-User,4,user1@example.com,0412345678,31,50,170,InvalidGender,4.5,135,120,1,1,0,1,Regular,Yes,Single,Private,1,Malay"""
+User,4,user1@example.com,0412345678,31,50,170,InvalidGender,4.5,135,120,1,1,0,1,Regular,Yes,Single,working,1,Malay"""
 
         pre_count = count_health_data()
         response = upload_csv(csv_data)
diff --git a/server/tests/routers/test_users.py b/server/tests/routers/test_users.py
index a640db5c..87d06cc8 100644
--- a/server/tests/routers/test_users.py
+++ b/server/tests/routers/test_users.py
@@ -208,7 +208,8 @@ def test_get_patient_data_returns_correct_fields():
         "weight",
         "height",
         "gender",
-        "age"
+        "age",
+        "race"
     }
     assert data["gender"] == "Male"
     assert data["age"] == datetime.today().year - 1980 - \

From 2dad20cee20944b25967b8117655b6319129476c Mon Sep 17 00:00:00 2001
From: wyl2003 <108109393+wyl2003@users.noreply.github.com>
Date: Wed, 20 May 2026 20:33:06 +0930
Subject: [PATCH 045/105] doc: docstring consistency in other py

---
 server/routers/admin.py             |  4 +---
 server/routers/health_prediction.py |  4 +---
 server/routers/users.py             | 13 +++----------
 3 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/server/routers/admin.py b/server/routers/admin.py
index 174d921f..5d37542f 100644
--- a/server/routers/admin.py
+++ b/server/routers/admin.py
@@ -261,9 +261,7 @@ async def update_user_role(user_email: str, role_id: int, request: Request,
 
 
 def _delete_user_data(user_email: str, db_conn: Session):
-    """
-    Deletes a user and all their associated data, returning a report of the deletion.
-    """
+    """Delete a user and all their associated data, returning a report of the deletion."""
     deletion_report = {}
 
     try:
diff --git a/server/routers/health_prediction.py b/server/routers/health_prediction.py
index af29c172..35f18026 100644
--- a/server/routers/health_prediction.py
+++ b/server/routers/health_prediction.py
@@ -757,9 +757,7 @@ def validate_all_input(data: HealthDataInput):
 
 
 def merchant_view_patient(user_id: int, patient_id: int, db_conn: Session):
-    """
-    Returns True if the merchant is linked to the patient, False if they can not.
-    """
+    """Check whether a merchant is linked to a patient; return True if linked."""
     access = db_conn.query(UserPatientAccess).filter_by(
         UserID=user_id,
         PatientID=patient_id
diff --git a/server/routers/users.py b/server/routers/users.py
index a5a86485..15e8a9f4 100644
--- a/server/routers/users.py
+++ b/server/routers/users.py
@@ -455,10 +455,7 @@ async def get_health_analytics(
     request: Request,
     db_conn: Session = Depends(get_db),
 ):
-    """
-    Returns time-series health risk probabilities for the current user
-    using historical predictions stored in the database.
-    """
+    """Return time-series health risk probabilities from the current user's historical predictions."""
     user_email = get_current_user(request, db_conn)
     patient = get_patient_by_email(user_email["email"], db_conn)
     if not patient:
@@ -1108,9 +1105,7 @@ async def get_merchant_dashboard(request: Request, db_conn: Session = Depends(ge
 
 @router.get("/patient-data")
 async def get_patient_data(request: Request, db_conn: Session = Depends(get_db)):
-    """
-    Retrieves a user's patient data required for report form inputs.
-    """
+    """Return the authenticated user's patient data for report form inputs."""
 
     # Get current user details.
     user = get_current_user(request, db_conn)
@@ -1134,9 +1129,7 @@ async def get_patient_data(request: Request, db_conn: Session = Depends(get_db))
 
 @router.get("/merchant/patient-data/{patient_id}")
 async def get_merchant_patient_data(patient_id: int, request: Request, db_conn: Session = Depends(get_db)):
-    """
-    Allows merchant to retrieve a user's patient data required for report form inputs.
-    """
+    """Return a patient's data for merchant report form inputs."""
 
     # Check if the requesting user is a merchant.
     current_user = get_current_user(request, db_conn)

From 239a362f836e1dea4573dcecde7fc537444bb1d7 Mon Sep 17 00:00:00 2001
From: wyl2003 <108109393+wyl2003@users.noreply.github.com>
Date: Wed, 20 May 2026 22:26:23 +0930
Subject: [PATCH 046/105] doc: update doc in admin.py

---
 server/routers/admin.py | 81 ++++++++++++++++++++++++++++++++++++++---
 1 file changed, 76 insertions(+), 5 deletions(-)

diff --git a/server/routers/admin.py b/server/routers/admin.py
index 5d37542f..84797909 100644
--- a/server/routers/admin.py
+++ b/server/routers/admin.py
@@ -93,7 +93,22 @@ async def get_users(
     sort_order: Optional[str] = "desc",
     db_conn: Session = Depends(get_db)
 ):
-    """Return all user accounts"""
+    """
+    Return a paginated, filterable, sortable list of validated user accounts.
+
+    Supports searching by email, patient name, or clinic name; filtering by
+    clinic; and sorting by email, creation date, or validation status.
+
+    :param skip: Number of records to skip (offset).
+    :param limit: Maximum number of records to return.
+    :param search: Optional keyword to search across email, name, and clinic.
+    :param clinic_id: Optional clinic ID to filter users.
+    :param sort_by: Column name to sort by (email, createdAt, validated).
+    :param sort_order: Sort direction (asc or desc).
+    :param db_conn: Database session provided by the FastAPI dependency.
+    :return: A dict with ``users`` (list) and ``total`` (count).
+    :raises HTTPException 400: If ``skip`` is negative or ``limit`` is not positive.
+    """
 
     if skip < 0:
         raise HTTPException(
@@ -188,7 +203,23 @@ async def get_users(
 @router.patch("/users/{user_email}/roles/{role_id}")
 async def update_user_role(user_email: str, role_id: int, request: Request,
                            db_conn: Session = Depends(get_db)):
-    """Update a user's role"""
+    """
+    Update a user's role to the specified role ID.
+
+    Verifies the requesting user is an administrator, prevents self-role
+    changes, and creates or updates the ``UserAccountRole`` mapping.
+    An audit log is written on both success and failure.
+
+    :param user_email: The email of the target user whose role will change.
+    :param role_id: The ``RoleID`` to assign to the user.
+    :param request: The HTTP request (for current-user extraction and audit logging).
+    :param db_conn: Database session provided by the FastAPI dependency.
+    :return: A dict with a success message and the assigned role info.
+    :raises HTTPException 401: If the requesting user cannot be identified.
+    :raises HTTPException 403: If the requesting user is not an admin.
+    :raises HTTPException 404: If the user or role is not found.
+    :raises HTTPException 400: If an admin attempts to change their own role.
+    """
     # Authenticate the requesting user.
     current_user_data = get_current_user(request, db_conn)
     requesting_user_email = current_user_data.get('email')
@@ -261,7 +292,19 @@ async def update_user_role(user_email: str, role_id: int, request: Request,
 
 
 def _delete_user_data(user_email: str, db_conn: Session):
-    """Delete a user and all their associated data, returning a report of the deletion."""
+    """
+    Delete a user and all their associated data, returning a report of the deletion.
+
+    Removes patient access links, recommendations, predictions, health data,
+    validation tokens, and role mappings in the correct order to avoid
+    foreign-key violations. Rolls back on failure.
+
+    :param user_email: The email of the account to delete.
+    :param db_conn: Database session.
+    :return: A dict with counts of deleted records per table.
+    :raises HTTPException 404: If the user is not found.
+    :raises HTTPException 500: If the deletion fails.
+    """
     deletion_report = {}
 
     try:
@@ -328,7 +371,22 @@ def _delete_user_data(user_email: str, db_conn: Session):
 
 @router.delete("/users/{user_email}")
 async def delete_user_by_admin(user_email: str, request: Request, db_conn: Session = Depends(get_db)):
-    """Delete a user account """
+    """
+    Delete a user account and all associated data (admin only).
+
+    Verifies the requesting user is an administrator, prevents self-deletion,
+    then cascades to remove health data, predictions, recommendations, and
+    role mappings. An audit log is written on both success and failure.
+
+    :param user_email: The email of the user account to delete.
+    :param request: The HTTP request (for current-user extraction and audit logging).
+    :param db_conn: Database session provided by the FastAPI dependency.
+    :return: A dict with a success message and a ``deletion_report``.
+    :raises HTTPException 401: If the requesting user cannot be identified.
+    :raises HTTPException 403: If the requesting user is not an admin.
+    :raises HTTPException 404: If the target user is not found.
+    :raises HTTPException 400: If an admin attempts to delete their own account.
+    """
     # Get the current user making the request
     current_user_data = get_current_user(request, db_conn)
     requesting_user_email = current_user_data.get('email')
@@ -412,7 +470,20 @@ async def get_invalid_merchant_accounts(db_conn: Session = Depends(get_db)):
 
 @router.patch("/users/merchants/{merchant_email}")
 async def validate_merchant(merchant_email: str, request: Request, db_conn: Session = Depends(get_db)):
-    """Validate a merchant user account"""
+    """
+    Validate a pending merchant account so they can access the platform.
+
+    Verifies the requesting user is an administrator, then sets the
+    merchant's ``IsValidated`` flag to 1. An audit log is written on
+    both success and failure.
+
+    :param merchant_email: The email of the merchant account to validate.
+    :param request: The HTTP request (for current-user extraction and audit logging).
+    :param db_conn: Database session provided by the FastAPI dependency.
+    :return: A dict with a success message.
+    :raises HTTPException 404: If the requesting user or merchant is not found.
+    :raises HTTPException 403: If the requesting user is not an admin.
+    """
     # Check if requesting user is Admin.
     current_user = get_current_user(request, db_conn)
     current_user_email = current_user.get('email')

From a3285b37b07e1ecf11629acbe4521c56c4c4658d Mon Sep 17 00:00:00 2001
From: Luke Bradley <bralc003@mymail.unisa.edu.au>
Date: Thu, 21 May 2026 19:11:12 +0930
Subject: [PATCH 047/105] Fix indent after resolving merge conflict

---
 server/routers/health_prediction.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/routers/health_prediction.py b/server/routers/health_prediction.py
index a8046469..6a68803f 100644
--- a/server/routers/health_prediction.py
+++ b/server/routers/health_prediction.py
@@ -638,12 +638,12 @@ def is_diabetes_valid(diabetes: int):
 
 
 def is_alcohol_valid(alcohol: str):
-  """Check whether ``alcohol`` is present in the predefined alcohol mapping."""
+    """Check whether ``alcohol`` is present in the predefined alcohol_map mapping."""
     return alcohol in alcohol_map
 
 
 def is_smoker_valid(smoker: str):
-    
+    """Check whether ``smoker`` is present in the predefined smoker_map mapping."""
     return smoker in smoker_map
 
 

From a0d829a768d42c93e6d4ef8a39b4ecfaecd9ebb2 Mon Sep 17 00:00:00 2001
From: A-Axisa <a3132688@adelaide.edu.au>
Date: Thu, 21 May 2026 23:25:12 +0930
Subject: [PATCH 048/105] Add JSdoc to front-end components and routes

---
 client/src/components/AcceptRequestForm.js    |   6 +-
 client/src/components/AppThemeProvider.jsx    |  38 +-
 client/src/components/BloodReportUpload.js    |   8 +
 client/src/components/DisclaimerPolicy.js     |  81 +++-
 client/src/components/DownloadReportButton.js |  46 +-
 client/src/components/GenerateReportForm.js   |   9 +-
 client/src/components/HealthReportPDFFlat.js  | 431 +++++++++++-------
 client/src/components/MerchantReportForm.js   |   8 +-
 client/src/components/Navbar.js               |  10 +
 client/src/components/PrivacyNotice.js        | 230 ++++++++--
 client/src/components/ReportTemplate.js       |   9 +
 .../components/RequestPatientAccessForm.js    |   2 +
 client/src/components/WelcomePanel.js         |   5 +-
 .../administrator/AccountApprovalTable.js     |  29 +-
 .../administrator/AuditLogSearchBar.js        |  12 +
 .../components/administrator/AuditLogTable.js |  90 +++-
 .../administrator/UserManagementTable.js      | 105 +++--
 .../components/administrator/UserSearchBar.js |  10 +
 .../components/administrator/UserToolBar.js   |  28 +-
 .../analytics/ActiveMerchantsAnalytics.js     |   6 +-
 .../analytics/ActiveUsersAnalytics.js         |   6 +-
 .../analytics/AverageRiskSeriesAnalytics.js   |   6 +-
 .../analytics/LoginActivityAnalytics.js       |   4 +-
 .../analytics/PendingMerchantsAnalytics.js    |   4 +-
 .../RecentReportsGeneratedAnalytics.js        |   6 +-
 .../analytics/UnvalidatedAccountAnalytics.js  |   4 +-
 .../analytics/UserAccountAnalytics.js         |   6 +-
 .../authentication/CreatePatientForm.js       |  12 +-
 .../authentication/EmailInputField.js         |   7 +-
 .../authentication/ForgotPasswordForm.js      |   4 +-
 .../components/authentication/LoginForm.js    |   6 +-
 .../authentication/PasswordInputField.js      |   1 +
 .../authentication/PhoneInputField.js         |   3 +-
 .../authentication/RegistrationForm.js        |   6 +
 .../authentication/ResetPasswordForm.js       |   4 +-
 client/src/components/confirmationDialog.js   |  26 +-
 client/src/routes/AcceptAccessRequest.js      |   5 +-
 client/src/routes/AdministratorApproval.js    |  16 +-
 client/src/routes/AdministratorDashboard.js   |   6 +
 client/src/routes/AdministratorLogs.js        |  15 +-
 client/src/routes/AdministratorUsers.js       |  14 +-
 client/src/routes/CreatePatient.js            |   4 +-
 client/src/routes/ErrorPage.js                |  27 +-
 client/src/routes/ForgotPassword.js           |   5 +-
 client/src/routes/GenerateReport.js           |   5 +
 client/src/routes/HealthAnalytics.js          |  16 +-
 client/src/routes/Login.js                    |   6 +-
 client/src/routes/MerchantGenerateReport.js   |   6 +
 client/src/routes/MerchantLanding.js          |   7 +
 client/src/routes/MerchantReports.js          |   8 +-
 client/src/routes/PatientDetails.js           |  36 +-
 client/src/routes/PatientManagement.js        |  34 +-
 client/src/routes/Register.js                 |   5 +-
 client/src/routes/ReportHistory.js            |   5 +
 client/src/routes/RequestPatientAccess.js     |   4 +-
 client/src/routes/ResetPassword.js            |   5 +-
 client/src/routes/UserLanding.js              |  16 +-
 client/src/routes/UserSettings.js             |  73 +--
 client/src/utils/LandingRoute.js              |   5 +
 client/src/utils/ProtectedRoutes.js           |   9 +
 client/src/utils/PublicOnlyRoutes.js          |   8 +-
 client/src/utils/UserContext.js               |   7 +
 62 files changed, 1153 insertions(+), 462 deletions(-)

diff --git a/client/src/components/AcceptRequestForm.js b/client/src/components/AcceptRequestForm.js
index d21c7e3f..84cc0337 100644
--- a/client/src/components/AcceptRequestForm.js
+++ b/client/src/components/AcceptRequestForm.js
@@ -16,8 +16,10 @@ import {
 const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
 
 /**
- * Allows the user to accept an access request from a merchant user.
- * This will allow the merchant to view manage the patients record.
+ * A form that allows a user to accept an access request from a merchant
+ * and grant the permission to view their health records.
+ *
+ * @returns {@mui.material.Container}
  */
 const AcceptRequestForm = () => {
   const [isLoading, setIsLoading] = useState(false);
diff --git a/client/src/components/AppThemeProvider.jsx b/client/src/components/AppThemeProvider.jsx
index 018ebdb0..be1f45f5 100644
--- a/client/src/components/AppThemeProvider.jsx
+++ b/client/src/components/AppThemeProvider.jsx
@@ -3,7 +3,9 @@ import { ThemeProvider, createTheme } from "@mui/material";
 import "@fontsource/russo-one";
 import { color, fontWeight } from "@mui/system";
 
-// Centralized MUI theme for the app
+/**
+ * A centralized MUI theme for the web app.
+ */
 export const appTheme = createTheme({
   shape: {
     borderRadius: 20,
@@ -93,19 +95,19 @@ export const appTheme = createTheme({
         elevation: 16,
       },
       variants: [
-    {
-      props: { variant: "report-section" },
-      style: ({ theme }) => ({
-        borderRadius: 0,
-        marginInline: theme.spacing(2),
-        padding: theme.spacing(2),
-        boxShadow: theme.shadows[3],
-        borderBottom: `1px solid ${theme.palette.divider}`,
-      }),
-    },
-  ],
+        {
+          props: { variant: "report-section" },
+          style: ({ theme }) => ({
+            borderRadius: 0,
+            marginInline: theme.spacing(2),
+            padding: theme.spacing(2),
+            boxShadow: theme.shadows[3],
+            borderBottom: `1px solid ${theme.palette.divider}`,
+          }),
+        },
+      ],
     },
-    
+
     MuiTypography: {
       styleOverrides: {
         root: {
@@ -128,15 +130,15 @@ export const appTheme = createTheme({
           fontFamily: "'Russo One', 'sans-serif'",
         },
         h4: {
-          fontWeight: 'regular',
+          fontWeight: "regular",
           fontFamily: "'Russo One', 'sans-serif'",
         },
         h5: {
-          fontWeight: 'regular',
+          fontWeight: "regular",
           fontFamily: "'Russo One', 'sans-serif'",
         },
         h7: {
-          fontWeight: 'regular',
+          fontWeight: "regular",
           fontFamily: "'Russo One', 'sans-serif'",
         },
       },
@@ -171,10 +173,10 @@ export const appTheme = createTheme({
             fontWeight: 600,
           },
           "& .MuiDataGrid-sortIcon": {
-            opacity: 'inherit !important',
+            opacity: "inherit !important",
           },
           "& .MuiDataGrid-iconButtonContainer": {
-              visibility: 'visible',
+            visibility: "visible",
           },
         },
         filler: {
diff --git a/client/src/components/BloodReportUpload.js b/client/src/components/BloodReportUpload.js
index 87a6f58e..cecdfffa 100644
--- a/client/src/components/BloodReportUpload.js
+++ b/client/src/components/BloodReportUpload.js
@@ -3,6 +3,14 @@ import { styled } from "@mui/material/styles";
 import FileUploadIcon from "@mui/icons-material/FileUpload";
 import pdfToText from "react-pdftotext";
 
+/**
+ * A button that allows a user to select and submit a blood report that
+ * will auto fill sections of the health report form.
+ *
+ * @param {Object} props
+ * @param {function} [props.onChange] - Callback function called when files are changed
+ * @returns {@mui.material.Button}
+ */
 const BloodReportUpload = ({ onChange }) => {
   const HiddenInput = styled("input")({
     clip: "rect(0 0 0 0)",
diff --git a/client/src/components/DisclaimerPolicy.js b/client/src/components/DisclaimerPolicy.js
index ff2bb85e..e0f3716b 100644
--- a/client/src/components/DisclaimerPolicy.js
+++ b/client/src/components/DisclaimerPolicy.js
@@ -4,60 +4,93 @@ import {
   DialogContent,
   DialogTitle,
   Box,
-  Button
+  Button,
 } from "@mui/material";
 
-
+/**
+ * A dialog box displaying the disclaimer policy for the service.
+ *
+ * @param {Object} props
+ * @param {boolean} [props.open]
+ * @param {function} [props.onClose] - Callback function for closing dialog
+ * @returns {@mui.material.Dialog}
+ */
 const DisclaimerPolicy = ({ open, onClose }) => {
   return (
     <Dialog open={open} onClose={onClose}>
       <DialogTitle sx={{ fontWeight: 600 }}>Disclaimer Policy</DialogTitle>
       <DialogContent>
-        <Typography sx={{ fontWeight: 600, mb: 1 }}>Important Information:</Typography>
+        <Typography sx={{ fontWeight: 600, mb: 1 }}>
+          Important Information:
+        </Typography>
         <Typography sx={{ mb: 3 }}>
-          This health predictive application (“App”) provides information and recommendations for your health and wellness. Please carefully read and understand this disclaimer before using the App.
+          This health predictive application (“App”) provides information and
+          recommendations for your health and wellness. Please carefully read
+          and understand this disclaimer before using the App.
         </Typography>
 
-        <Typography sx={{ fontWeight: 600, mb: 1 }}>Accuracy and Limitations:</Typography>
+        <Typography sx={{ fontWeight: 600, mb: 1 }}>
+          Accuracy and Limitations:
+        </Typography>
         <Typography sx={{ mb: 3 }}>
-          The App's predictions are based on algorithms trained on various health data sources and general health knowledge. These predictions are not the result of medical studies and should not be considered definitive diagnoses or medical advice.
-          The App does not claim to replace or substitute for professional medical advice, diagnosis, or treatment.
-          Always consult with your doctor or other qualified healthcare professional before making any changes to your diet, exercise routine, or other health-related decisions.
+          The App's predictions are based on algorithms trained on various
+          health data sources and general health knowledge. These predictions
+          are not the result of medical studies and should not be considered
+          definitive diagnoses or medical advice. The App does not claim to
+          replace or substitute for professional medical advice, diagnosis, or
+          treatment. Always consult with your doctor or other qualified
+          healthcare professional before making any changes to your diet,
+          exercise routine, or other health-related decisions.
         </Typography>
 
-        <Typography sx={{ fontWeight: 600, mb: 1 }}>Health Recommendations:</Typography>
+        <Typography sx={{ fontWeight: 600, mb: 1 }}>
+          Health Recommendations:
+        </Typography>
         <Typography sx={{ mb: 3 }}>
-          The App offers personalized health recommendations based on your input and the expertise of qualified dietitians. These recommendations are intended to provide general guidance and support for improving your health and well-being.
-          The recommendations are not individualized medical advice and may not be suitable for everyone. You should always discuss any recommended changes with your doctor or other qualified healthcare professional before implementing them.
+          The App offers personalized health recommendations based on your input
+          and the expertise of qualified dietitians. These recommendations are
+          intended to provide general guidance and support for improving your
+          health and well-being. The recommendations are not individualized
+          medical advice and may not be suitable for everyone. You should always
+          discuss any recommended changes with your doctor or other qualified
+          healthcare professional before implementing them.
         </Typography>
 
-        <Typography sx={{ fontWeight: 600, mb: 1 }}>Data Privacy and Security:</Typography>
+        <Typography sx={{ fontWeight: 600, mb: 1 }}>
+          Data Privacy and Security:
+        </Typography>
         <Typography sx={{ mb: 3 }}>
-          We take your privacy seriously and are committed to protecting your personal information. Please refer to our Privacy Policy for details on how we collect, use, and protect your data.
+          We take your privacy seriously and are committed to protecting your
+          personal information. Please refer to our Privacy Policy for details
+          on how we collect, use, and protect your data.
         </Typography>
 
-        <Typography sx={{ fontWeight: 600, mb: 1 }}>Additional Disclaimer:</Typography>
+        <Typography sx={{ fontWeight: 600, mb: 1 }}>
+          Additional Disclaimer:
+        </Typography>
         <Typography sx={{ mb: 3 }}>
-          We make no guarantees or warranties, express or implied, regarding the accuracy, completeness, or reliability of the information provided by the App.
-          The App is provided “as is” and “as available” without any warranties or guarantees of any kind.
-          We are not responsible for any damages or injuries that may arise from your use of the App.
-          By using the App, you agree to the terms and conditions of this Disclaimer.
+          We make no guarantees or warranties, express or implied, regarding the
+          accuracy, completeness, or reliability of the information provided by
+          the App. The App is provided “as is” and “as available” without any
+          warranties or guarantees of any kind. We are not responsible for any
+          damages or injuries that may arise from your use of the App. By using
+          the App, you agree to the terms and conditions of this Disclaimer.
         </Typography>
 
         <Typography sx={{ fontWeight: 600, mb: 1 }}>Contact Us:</Typography>
         <Typography sx={{ mb: 3 }}>
-          If you have any questions or concerns about this Disclaimer, please contact us at contactus@wellai.app.
-          This disclaimer is for informational purposes only and does not constitute legal advice. Please consult with an attorney for legal advice.
+          If you have any questions or concerns about this Disclaimer, please
+          contact us at contactus@wellai.app. This disclaimer is for
+          informational purposes only and does not constitute legal advice.
+          Please consult with an attorney for legal advice.
         </Typography>
 
         <Box sx={{ textAlign: "center" }}>
-          <Button onClick={onClose}>
-            Close
-          </Button>
+          <Button onClick={onClose}>Close</Button>
         </Box>
       </DialogContent>
     </Dialog>
   );
 };
 
-export default DisclaimerPolicy;
\ No newline at end of file
+export default DisclaimerPolicy;
diff --git a/client/src/components/DownloadReportButton.js b/client/src/components/DownloadReportButton.js
index 43e9b5fa..d7c14104 100644
--- a/client/src/components/DownloadReportButton.js
+++ b/client/src/components/DownloadReportButton.js
@@ -1,8 +1,8 @@
-import { pdf } from '@react-pdf/renderer';
-import { saveAs } from 'file-saver';
-import HealthReportPDFFlat from './HealthReportPDFFlat';
-import { Button } from '@mui/material';
-import DownloadIcon from '@mui/icons-material/Download';
+import { pdf } from "@react-pdf/renderer";
+import { saveAs } from "file-saver";
+import HealthReportPDFFlat from "./HealthReportPDFFlat";
+import { Button } from "@mui/material";
+import DownloadIcon from "@mui/icons-material/Download";
 
 /**
  * A simple button component to trigger a PDF report download for a specific health data ID.
@@ -16,9 +16,14 @@ import DownloadIcon from '@mui/icons-material/Download';
  * @param {object} [props.flatReportData] - Already-fetched flat report data from /getReportData/{id}.
  * @param {object} [props.meta] - Additional metadata: { date, healthDataID, fileNameHint }.
  * @param {function} props.onError - Callback function to handle errors.
+ * @returns {@mui.material.Button}
  */
-const DownloadReportButton = ({ healthDataId, flatReportData, meta, onError }) => {
-
+const DownloadReportButton = ({
+  healthDataId,
+  flatReportData,
+  meta,
+  onError,
+}) => {
   const handleDownload = async () => {
     if (!flatReportData && !healthDataId) {
       onError?.("Health Data ID is required.");
@@ -28,24 +33,28 @@ const DownloadReportButton = ({ healthDataId, flatReportData, meta, onError }) =
     try {
       // Build local date string for filename to avoid timezone shift
       const buildLocalDatePart = (value) => {
-        if (!value) return 'report';
+        if (!value) return "report";
         const d = new Date(value);
-        if (Number.isNaN(d.getTime())) return 'report';
+        if (Number.isNaN(d.getTime())) return "report";
         const y = d.getFullYear();
-        const m = String(d.getMonth() + 1).padStart(2, '0');
-        const day = String(d.getDate()).padStart(2, '0');
+        const m = String(d.getMonth() + 1).padStart(2, "0");
+        const day = String(d.getDate()).padStart(2, "0");
         return `${y}-${m}-${day}`;
       };
 
       // Generate from flat data (page already has it)
-      const fileName = meta?.fileNameHint
-        || `HealthReport_${String(meta?.healthDataID ?? healthDataId)}_${buildLocalDatePart(meta?.date)}.pdf`;
+      const fileName =
+        meta?.fileNameHint ||
+        `HealthReport_${String(meta?.healthDataID ?? healthDataId)}_${buildLocalDatePart(meta?.date)}.pdf`;
       const blob = await pdf(
-        <HealthReportPDFFlat data={flatReportData} metaId={meta?.healthDataID ?? healthDataId} metaDate={meta?.date} />
+        <HealthReportPDFFlat
+          data={flatReportData}
+          metaId={meta?.healthDataID ?? healthDataId}
+          metaDate={meta?.date}
+        />,
       ).toBlob();
       saveAs(blob, fileName);
       if (onError) onError?.(null); // Clear previous errors on success
-
     } catch (error) {
       console.error("Failed to download report:", error);
       if (onError) onError(error.message);
@@ -53,7 +62,12 @@ const DownloadReportButton = ({ healthDataId, flatReportData, meta, onError }) =
   };
 
   return (
-    <Button variant="contained" color="primary" onClick={handleDownload} startIcon={<DownloadIcon />}> 
+    <Button
+      variant="contained"
+      color="primary"
+      onClick={handleDownload}
+      startIcon={<DownloadIcon />}
+    >
       Download Report
     </Button>
   );
diff --git a/client/src/components/GenerateReportForm.js b/client/src/components/GenerateReportForm.js
index 8b46aaa1..59987d78 100644
--- a/client/src/components/GenerateReportForm.js
+++ b/client/src/components/GenerateReportForm.js
@@ -1,5 +1,4 @@
 import { useState, useEffect } from "react";
-
 import { useNavigate } from "react-router-dom";
 import {
   Card,
@@ -17,14 +16,18 @@ import {
   Select,
   FormHelperText,
 } from "@mui/material";
-
 import CheckBoxOutlineBlankIcon from "@mui/icons-material/CheckBoxOutlineBlank";
 import CheckBoxIcon from "@mui/icons-material/CheckBox";
-
 import BloodReportUpload from "./BloodReportUpload";
 
 const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
 
+/**
+ * A form that can be filled in by a standard user with their health
+ * information to generate a health report.
+ *
+ * @returns {@mui.material.Card}
+ */
 const GenerateReportForm = () => {
   const navigate = useNavigate();
 
diff --git a/client/src/components/HealthReportPDFFlat.js b/client/src/components/HealthReportPDFFlat.js
index 48e0b6bf..0312fe5b 100644
--- a/client/src/components/HealthReportPDFFlat.js
+++ b/client/src/components/HealthReportPDFFlat.js
@@ -1,129 +1,140 @@
-import { Page, Text, View, Document, StyleSheet, Image } from '@react-pdf/renderer';
-import WellAiLogo from '../assets/WellAiLogoTR.png';
+import {
+  Page,
+  Text,
+  View,
+  Document,
+  StyleSheet,
+  Image,
+} from "@react-pdf/renderer";
+import WellAiLogo from "../assets/WellAiLogoTR.png";
+
+/**
+ * The document used for converting a health report to a PDF File.
+ */
 
 // Styles reused for flat report PDF
 const styles = StyleSheet.create({
-  page: { 
-    flexDirection: 'column', 
-    backgroundColor: '#FFFFFF', 
-    paddingTop: 100,    // Space for fixed header
-    paddingBottom: 70,  // Space for fixed footer
+  page: {
+    flexDirection: "column",
+    backgroundColor: "#FFFFFF",
+    paddingTop: 100, // Space for fixed header
+    paddingBottom: 70, // Space for fixed footer
     paddingLeft: 40,
     paddingRight: 40,
-    fontFamily: 'Helvetica'
+    fontFamily: "Helvetica",
   },
   watermarkContainer: {
-    position: 'absolute',
+    position: "absolute",
     top: 250,
     left: 80,
     right: 80,
     opacity: 0.08,
-    justifyContent: 'center',
-    alignItems: 'center',
-    zIndex: -1
+    justifyContent: "center",
+    alignItems: "center",
+    zIndex: -1,
   },
   watermarkImage: {
     width: 400,
     height: 400,
-    objectFit: 'contain'
+    objectFit: "contain",
   },
   headerContainer: {
-    position: 'absolute',
+    position: "absolute",
     top: 30,
     left: 40,
     right: 40,
   },
   headerTop: {
-    flexDirection: 'row',
-    justifyContent: 'space-between',
-    alignItems: 'flex-end',
+    flexDirection: "row",
+    justifyContent: "space-between",
+    alignItems: "flex-end",
     marginBottom: 5,
   },
   headerLeftText: {
     fontSize: 10,
-    color: '#888888',
-    marginBottom: 5
+    color: "#888888",
+    marginBottom: 5,
   },
   logo: {
-    width: 120, 
+    width: 120,
     height: 35,
-    objectFit: 'contain'
+    objectFit: "contain",
   },
   headerLineContainer: {
-    position: 'relative',
+    position: "relative",
     height: 8,
     marginBottom: 10,
   },
   headerLine: {
-    position: 'absolute',
+    position: "absolute",
     top: 4,
     left: 0,
     right: 0,
     height: 1,
-    backgroundColor: '#888888'
+    backgroundColor: "#888888",
   },
   headerBottom: {
-    flexDirection: 'row',
-    justifyContent: 'space-between',
+    flexDirection: "row",
+    justifyContent: "space-between",
     marginTop: 5,
   },
   metaText: {
     fontSize: 10,
-    color: '#000',
+    color: "#000",
   },
   content: {
     flex: 1,
   },
   reportTitle: {
-    fontFamily: 'Helvetica-Bold',
+    fontFamily: "Helvetica-Bold",
     fontSize: 20,
-    textAlign: 'center',
-    textDecoration: 'underline',
+    textAlign: "center",
+    textDecoration: "underline",
     marginBottom: 15,
   },
   sessionTitle: {
-    fontFamily: 'Helvetica-Oblique',
+    fontFamily: "Helvetica-Oblique",
     fontSize: 12,
-    textDecoration: 'underline',
+    textDecoration: "underline",
     marginBottom: 5,
   },
   table: {
     borderWidth: 1,
-    borderColor: '#000',
+    borderColor: "#000",
     marginBottom: 20,
   },
   tableHeader: {
-    flexDirection: 'row',
-    backgroundColor: '#EBEBEB',
+    flexDirection: "row",
+    backgroundColor: "#EBEBEB",
     borderBottomWidth: 1,
-    borderBottomColor: '#000',
+    borderBottomColor: "#000",
   },
   tableHeaderCell: {
     padding: 5,
-    justifyContent: 'center',
-    alignItems: 'center',
+    justifyContent: "center",
+    alignItems: "center",
   },
   tableHeaderCellText: {
-    fontFamily: 'Helvetica-Bold',
+    fontFamily: "Helvetica-Bold",
     fontSize: 10,
-    textAlign: 'center',
+    textAlign: "center",
   },
   tableRow: {
-    flexDirection: 'row',
+    flexDirection: "row",
     borderBottomWidth: 1,
-    borderBottomColor: '#000',
+    borderBottomColor: "#000",
   },
   tableCell: {
     padding: 5,
     fontSize: 10,
-    justifyContent: 'center',
-    alignItems: 'center',
-    textAlign: 'center',
+    justifyContent: "center",
+    alignItems: "center",
+    textAlign: "center",
   },
   tableCellTitle: {
-    fontFamily: 'Helvetica-Bold',
+    fontFamily: "Helvetica-Bold",
     fontSize: 10,
-    textAlign: 'center',
+    textAlign: "center",
   },
   recommendationSection: {
     marginBottom: 12,
@@ -131,10 +142,10 @@ const styles = StyleSheet.create({
   recommendationLabel: {
     fontSize: 10,
     marginBottom: 2,
-    fontFamily: 'Helvetica',
+    fontFamily: "Helvetica",
   },
   bulletRow: {
-    flexDirection: 'row',
+    flexDirection: "row",
     marginBottom: 3,
     paddingLeft: 20,
     paddingRight: 10,
@@ -142,7 +153,7 @@ const styles = StyleSheet.create({
   bulletSign: {
     width: 12,
     fontSize: 10,
-    fontFamily: 'Helvetica',
+    fontFamily: "Helvetica",
   },
   bulletContent: {
     flex: 1,
@@ -152,187 +163,301 @@ const styles = StyleSheet.create({
   disclaimer: {
     fontSize: 9,
     lineHeight: 1.3,
-    textAlign: 'justify',
+    textAlign: "justify",
   },
   privacyText: {
     fontSize: 9,
   },
   link: {
-    color: '#0066cc',
-    textDecoration: 'underline',
+    color: "#0066cc",
+    textDecoration: "underline",
   },
   footerContainer: {
-    position: 'absolute',
+    position: "absolute",
     bottom: 30,
     left: 40,
     right: 40,
   },
   footerLine: {
     height: 1,
-    backgroundColor: '#888888',
+    backgroundColor: "#888888",
     marginBottom: 5,
   },
   footerContent: {
-    flexDirection: 'row',
-    justifyContent: 'space-between',
+    flexDirection: "row",
+    justifyContent: "space-between",
   },
   footerText: {
     fontSize: 9,
-    color: '#888',
-  }
+    color: "#888",
+  },
 });
 
 const getRisk = (val) => {
   const percentage = Number(val || 0);
-  if (percentage >= 50) return { label: 'HIGH', color: '#FF0000' };
-  if (percentage >= 30) return { label: 'MEDIUM', color: '#FFB800' };
-  return { label: 'LOW', color: '#00B050' };
+  if (percentage >= 50) return { label: "HIGH", color: "#FF0000" };
+  if (percentage >= 30) return { label: "MEDIUM", color: "#FFB800" };
+  return { label: "LOW", color: "#00B050" };
 };
 
 const pct = (v) => `${Number(v || 0).toFixed(1)}%`;
 
 const TableRow = ({ index, disease, chance, risk, noBorderBottom }) => (
-  <View style={[styles.tableRow, noBorderBottom ? { borderBottomWidth: 0 } : {}]}>
-    <View style={[styles.tableCell, { width: '10%', borderRightColor: '#000', borderRightWidth: 1 }]}>
-       <Text>{index}</Text>
+  <View
+    style={[styles.tableRow, noBorderBottom ? { borderBottomWidth: 0 } : {}]}
+  >
+    <View
+      style={[
+        styles.tableCell,
+        { width: "10%", borderRightColor: "#000", borderRightWidth: 1 },
+      ]}
+    >
+      <Text>{index}</Text>
     </View>
-    <View style={[styles.tableCell, { width: '40%', borderRightColor: '#000', borderRightWidth: 1, alignItems: 'flex-start', paddingLeft: 10 }]}>
-       <Text>{disease}</Text>
+    <View
+      style={[
+        styles.tableCell,
+        {
+          width: "40%",
+          borderRightColor: "#000",
+          borderRightWidth: 1,
+          alignItems: "flex-start",
+          paddingLeft: 10,
+        },
+      ]}
+    >
+      <Text>{disease}</Text>
     </View>
-    <View style={[styles.tableCell, { width: '25%', borderRightColor: '#000', borderRightWidth: 1 }]}>
-       <Text>{pct(chance)}</Text>
+    <View
+      style={[
+        styles.tableCell,
+        { width: "25%", borderRightColor: "#000", borderRightWidth: 1 },
+      ]}
+    >
+      <Text>{pct(chance)}</Text>
     </View>
-    <View style={[styles.tableCell, { width: '25%' }]}>
-       <Text style={[styles.tableCellTitle, { color: risk.color }]}>{risk.label}</Text>
+    <View style={[styles.tableCell, { width: "25%" }]}>
+      <Text style={[styles.tableCellTitle, { color: risk.color }]}>
+        {risk.label}
+      </Text>
     </View>
   </View>
 );
 
 const renderParagraph = (text) => {
-  if (!text) return (
-    <View style={styles.bulletRow}>
-      <Text style={styles.bulletSign}>-</Text>
-      <Text style={styles.bulletContent}>N/A</Text>
-    </View>
-  );
-  
-  const lines = text.replace(/\r/g, '').split('\n');
+  if (!text)
+    return (
+      <View style={styles.bulletRow}>
+        <Text style={styles.bulletSign}>-</Text>
+        <Text style={styles.bulletContent}>N/A</Text>
+      </View>
+    );
+
+  const lines = text.replace(/\r/g, "").split("\n");
   return lines.map((line, idx) => {
     let t = line.trim();
     if (!t) return null;
-    if (t.startsWith('-') || t.startsWith('•') || t.startsWith('*')) {
+    if (t.startsWith("-") || t.startsWith("•") || t.startsWith("*")) {
       t = t.substring(1).trim();
     }
     return (
       <View key={idx} style={styles.bulletRow}>
-         <Text style={styles.bulletSign}>-</Text>
-         <Text style={styles.bulletContent}>{t}</Text>
+        <Text style={styles.bulletSign}>-</Text>
+        <Text style={styles.bulletContent}>{t}</Text>
       </View>
     );
   });
 };
 
-// PDF for flat report data returned from /getReportData/{id}
-// Props: { data, metaId, metaDate }
+/**
+ * A document representing a user's health report in a PDF format.
+ *
+ * @param {Object} props
+ * @param {Object} [props.data] - Health data from health report
+ * @param {Object} [props.metaId] - Health report ID
+ * @param {Object} [props.metaDate] - Date the health report was generated
+ * @returns {@react-pdf.renderer.Document}
+ */
 const HealthReportPDFFlat = ({ data, metaId, metaDate }) => {
   const dateObj = metaDate ? new Date(metaDate) : new Date();
-  const dateStr = dateObj.toLocaleDateString('en-GB', {
-    day: 'numeric', month: 'long', year: 'numeric'
+  const dateStr = dateObj.toLocaleDateString("en-GB", {
+    day: "numeric",
+    month: "long",
+    year: "numeric",
   });
 
-  const patientName = (data.patientName || '').trim() || 'Patient';
+  const patientName = (data.patientName || "").trim() || "Patient";
 
   return (
     <Document>
       <Page size="A4" style={styles.page}>
         {/* Background Watermark */}
         <View fixed style={styles.watermarkContainer}>
-            <Image src={WellAiLogo} style={styles.watermarkImage} />
+          <Image src={WellAiLogo} style={styles.watermarkImage} />
         </View>
 
         {/* Fixed Header */}
         <View fixed style={styles.headerContainer}>
-            <View style={styles.headerTop}>
-              <Text style={styles.headerLeftText}>Predictive Health Report for Early Detection</Text>
-              <Image src={WellAiLogo} style={styles.logo} />
-            </View>
-            <View style={styles.headerLineContainer}>
-              <View style={styles.headerLine} />
-            </View>
-            <View style={styles.headerBottom}>
-              <Text style={styles.metaText}>Name: {patientName}</Text>
-              <Text style={styles.metaText}>Report date: {dateStr}</Text>
-            </View>
+          <View style={styles.headerTop}>
+            <Text style={styles.headerLeftText}>
+              Predictive Health Report for Early Detection
+            </Text>
+            <Image src={WellAiLogo} style={styles.logo} />
+          </View>
+          <View style={styles.headerLineContainer}>
+            <View style={styles.headerLine} />
+          </View>
+          <View style={styles.headerBottom}>
+            <Text style={styles.metaText}>Name: {patientName}</Text>
+            <Text style={styles.metaText}>Report date: {dateStr}</Text>
+          </View>
         </View>
 
         {/* Fixed Footer */}
         <View fixed style={styles.footerContainer}>
-            <View style={styles.footerLine} />
-            <View style={styles.footerContent}>
-              <Text style={styles.footerText}>All Copyright Reserved © {dateObj.getFullYear()}</Text>
-              <Text style={styles.footerText} render={({ pageNumber, totalPages }) => `Page ${pageNumber} of ${totalPages}`} />
-            </View>
+          <View style={styles.footerLine} />
+          <View style={styles.footerContent}>
+            <Text style={styles.footerText}>
+              All Copyright Reserved © {dateObj.getFullYear()}
+            </Text>
+            <Text
+              style={styles.footerText}
+              render={({ pageNumber, totalPages }) =>
+                `Page ${pageNumber} of ${totalPages}`
+              }
+            />
+          </View>
         </View>
 
         {/* Body Content */}
         <View style={styles.content}>
-           {/* Title */}
-           <Text style={styles.reportTitle}>Health Prediction Report</Text>
+          {/* Title */}
+          <Text style={styles.reportTitle}>Health Prediction Report</Text>
+
+          {/* Session 1 */}
+          <Text style={styles.sessionTitle}>Session 1 - Analysis Result</Text>
+          <View style={styles.table}>
+            {/* Table Header */}
+            <View style={styles.tableHeader}>
+              <View
+                style={[
+                  styles.tableHeaderCell,
+                  {
+                    width: "10%",
+                    borderRightColor: "#000",
+                    borderRightWidth: 1,
+                  },
+                ]}
+              >
+                <Text style={styles.tableHeaderCellText}>No.</Text>
+              </View>
+              <View
+                style={[
+                  styles.tableHeaderCell,
+                  {
+                    width: "40%",
+                    borderRightColor: "#000",
+                    borderRightWidth: 1,
+                  },
+                ]}
+              >
+                <Text style={styles.tableHeaderCellText}>
+                  Disease Description
+                </Text>
+              </View>
+              <View
+                style={[
+                  styles.tableHeaderCell,
+                  {
+                    width: "25%",
+                    borderRightColor: "#000",
+                    borderRightWidth: 1,
+                  },
+                ]}
+              >
+                <Text style={styles.tableHeaderCellText}>
+                  AI-Powered{"\n"}Prediction Result
+                </Text>
+              </View>
+              <View style={[styles.tableHeaderCell, { width: "25%" }]}>
+                <Text style={styles.tableHeaderCellText}>
+                  Risk{"\n"}Category
+                </Text>
+              </View>
+            </View>
+
+            {/* Rows */}
+            <TableRow
+              index={1}
+              disease="Cardiovascular Disease"
+              chance={data.CVDChance}
+              risk={getRisk(data.CVDChance)}
+            />
+            <TableRow
+              index={2}
+              disease="Diabetics"
+              chance={data.diabetesChance}
+              risk={getRisk(data.diabetesChance)}
+            />
+            <TableRow
+              index={3}
+              disease="Stroke"
+              chance={data.strokeChance}
+              risk={getRisk(data.strokeChance)}
+              noBorderBottom
+            />
+          </View>
+
+          {/* Session 2 */}
+          <Text style={styles.sessionTitle}>
+            Session 2 – Personal Health Recommendations
+          </Text>
 
-           {/* Session 1 */}
-           <Text style={styles.sessionTitle}>Session 1 - Analysis Result</Text>
-           <View style={styles.table}>
-             {/* Table Header */}
-             <View style={styles.tableHeader}>
-               <View style={[styles.tableHeaderCell, { width: '10%', borderRightColor: '#000', borderRightWidth: 1 }]}><Text style={styles.tableHeaderCellText}>No.</Text></View>
-               <View style={[styles.tableHeaderCell, { width: '40%', borderRightColor: '#000', borderRightWidth: 1 }]}><Text style={styles.tableHeaderCellText}>Disease Description</Text></View>
-               <View style={[styles.tableHeaderCell, { width: '25%', borderRightColor: '#000', borderRightWidth: 1 }]}><Text style={styles.tableHeaderCellText}>AI-Powered{'\n'}Prediction Result</Text></View>
-               <View style={[styles.tableHeaderCell, { width: '25%' }]}><Text style={styles.tableHeaderCellText}>Risk{'\n'}Category</Text></View>
-             </View>
-             
-             {/* Rows */}
-             <TableRow index={1} disease="Cardiovascular Disease" chance={data.CVDChance} risk={getRisk(data.CVDChance)} />
-             <TableRow index={2} disease="Diabetics" chance={data.diabetesChance} risk={getRisk(data.diabetesChance)} />
-             <TableRow index={3} disease="Stroke" chance={data.strokeChance} risk={getRisk(data.strokeChance)} noBorderBottom />
-           </View>
+          <View style={styles.recommendationSection}>
+            <Text style={styles.recommendationLabel}>Lifestyle:</Text>
+            {renderParagraph(
+              data.lifestyleRecommendation || data.exerciseRecommendation,
+            )}
+          </View>
+
+          <View style={styles.recommendationSection}>
+            <Text style={styles.recommendationLabel}>Food Intake:</Text>
+            {renderParagraph(data.dietRecommendation)}
+          </View>
+
+          <View style={styles.recommendationSection}>
+            <Text style={styles.recommendationLabel}>Food to Avoid:</Text>
+            {renderParagraph(data.dietToAvoidRecommendation)}
+          </View>
 
-           {/* Session 2 */}
-           <Text style={styles.sessionTitle}>Session 2 – Personal Health Recommendations</Text>
-           
-           <View style={styles.recommendationSection}>
-             <Text style={styles.recommendationLabel}>Lifestyle:</Text>
-             {renderParagraph(data.lifestyleRecommendation || data.exerciseRecommendation)}
-           </View>
-           
-           <View style={styles.recommendationSection}>
-             <Text style={styles.recommendationLabel}>Food Intake:</Text>
-             {renderParagraph(data.dietRecommendation)}
-           </View>
-           
-           <View style={styles.recommendationSection}>
-             <Text style={styles.recommendationLabel}>Food to Avoid:</Text>
-             {renderParagraph(data.dietToAvoidRecommendation)}
-           </View>
-           
-           <View style={styles.recommendationSection}>
-             <Text style={styles.recommendationLabel}>Exercise Recommendations:</Text>
-             {renderParagraph(data.exerciseRecommendation)}
-           </View>
+          <View style={styles.recommendationSection}>
+            <Text style={styles.recommendationLabel}>
+              Exercise Recommendations:
+            </Text>
+            {renderParagraph(data.exerciseRecommendation)}
+          </View>
 
           {/* Break hint: we want disclaimer to either stay at the end or push to next page. */}
           <Text style={[styles.disclaimer, { marginTop: 30 }]} break>
-            Disclaimer: The information provided by this health prediction report is intended for informational
-            purposes only and should not be construed as medical advice. Always consult with a qualified
-            healthcare professional regarding any questions or concerns you may have about your health. Kindly
-            note that the predictions may not be completely accurate and may not take into account all relevant
-            factors, and results may vary depending on your individual health history and circumstances. By using
-            this prediction report, you agree that you understand and accept the limitations of the information
-            provided.
+            Disclaimer: The information provided by this health prediction
+            report is intended for informational purposes only and should not be
+            construed as medical advice. Always consult with a qualified
+            healthcare professional regarding any questions or concerns you may
+            have about your health. Kindly note that the predictions may not be
+            completely accurate and may not take into account all relevant
+            factors, and results may vary depending on your individual health
+            history and circumstances. By using this prediction report, you
+            agree that you understand and accept the limitations of the
+            information provided.
           </Text>
-          
+
           <View style={{ marginTop: 20 }}>
             <Text style={styles.privacyText}>
-              For our privacy notice, please refer to <Text style={styles.link}>https://wellai.app/privacy-notice/</Text>.
+              For our privacy notice, please refer to{" "}
+              <Text style={styles.link}>
+                https://wellai.app/privacy-notice/
+              </Text>
+              .
             </Text>
           </View>
         </View>
diff --git a/client/src/components/MerchantReportForm.js b/client/src/components/MerchantReportForm.js
index 94c62652..015c328f 100644
--- a/client/src/components/MerchantReportForm.js
+++ b/client/src/components/MerchantReportForm.js
@@ -11,7 +11,6 @@ import {
   Button,
   Autocomplete,
 } from "@mui/material";
-
 import OutlinedInput from "@mui/material/OutlinedInput";
 import InputLabel from "@mui/material/InputLabel";
 import MenuItem from "@mui/material/MenuItem";
@@ -23,11 +22,16 @@ import CheckBoxIcon from "@mui/icons-material/CheckBox";
 import FormHelperText from "@mui/material/FormHelperText";
 import FileUploadIcon from "@mui/icons-material/FileUpload";
 import { styled } from "@mui/material/styles";
-
 import BloodReportUpload from "./BloodReportUpload";
 
 const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
 
+/**
+ * A form that can be filled in by a merchant with a patients health
+ * information to generate health report for them.
+ *
+ * @returns {@mui.material.Card}
+ */
 const MerchantReportForm = () => {
   const navigate = useNavigate();
   const location = useLocation();
diff --git a/client/src/components/Navbar.js b/client/src/components/Navbar.js
index 0e4d35a9..3a9843b6 100644
--- a/client/src/components/Navbar.js
+++ b/client/src/components/Navbar.js
@@ -38,6 +38,16 @@ import ChevronLeftIcon from "@mui/icons-material/ChevronLeft";
 
 const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
 
+/**
+ * A navigation bar located on the side of the page that allows quick navigation
+ * of the service. Different tabs will be displayed based on the current
+ * user's role and provide access to the appropriate pages.
+ * The service's disclaimer policy and privacy notice are also located at the bottom.
+ *
+ * @param {Object} props
+ * @param {string} [props.role] - Renders different tabs based on a user's role.
+ * @returns {<>}
+ */
 const NavBar = ({ role }) => {
   // Maps each route to the corrosponding page title.
   const routePageMap = {
diff --git a/client/src/components/PrivacyNotice.js b/client/src/components/PrivacyNotice.js
index 450d0daa..d28f6c2e 100644
--- a/client/src/components/PrivacyNotice.js
+++ b/client/src/components/PrivacyNotice.js
@@ -4,122 +4,254 @@ import {
   DialogContent,
   DialogTitle,
   Box,
-  Button
+  Button,
 } from "@mui/material";
 
-
+/**
+ * A dialog box displaying the privacy notice for the service.
+ *
+ * @param {Object} props
+ * @param {boolean} [props.open]
+ * @param {function} [props.onClose] - Callback function for closing dialog
+ * @returns {@mui.material.Dialog}
+ */
 const PrivacyNotice = ({ open, onClose }) => {
   return (
     <Dialog open={open} onClose={onClose}>
       <DialogTitle sx={{ fontWeight: 600 }}>Privacy Notice</DialogTitle>
       <DialogContent>
         <Typography sx={{ mb: 3 }}>
-          This Privacy Notice is issued by WellAI Sdn Bhd (“WellAI”) to regulate the collection and processing of your Personal Data (as herein defined) in strict accordance with the requirements of the Personal Data Protection Act, Malaysia, 2010 (PDPA).
-          By interacting with us, submitting information to us, or signing up for any products and services offered by us, you agree and consent to WellAI, as well as its representatives and/or agents collecting, using, disclosing and sharing amongst themselves your Personal Data, and disclosing such Personal Data to our authorised service providers and relevant third parties in the manners set forth in this Privacy Notice.
-          This Privacy Notice supplements but does not supersede nor replace any other consents you may have previously provided to WellAI in respect of your Personal Data, and your consents herein are additional to any rights which any member of WellAI may have at law to collect, use, or disclose your Personal Data.
-          Please note that WellAI may amend this Privacy Notice at any time without prior notice and will notify you of any such amendment via our website or by email.
+          This Privacy Notice is issued by WellAI Sdn Bhd (“WellAI”) to regulate
+          the collection and processing of your Personal Data (as herein
+          defined) in strict accordance with the requirements of the Personal
+          Data Protection Act, Malaysia, 2010 (PDPA). By interacting with us,
+          submitting information to us, or signing up for any products and
+          services offered by us, you agree and consent to WellAI, as well as
+          its representatives and/or agents collecting, using, disclosing and
+          sharing amongst themselves your Personal Data, and disclosing such
+          Personal Data to our authorised service providers and relevant third
+          parties in the manners set forth in this Privacy Notice. This Privacy
+          Notice supplements but does not supersede nor replace any other
+          consents you may have previously provided to WellAI in respect of your
+          Personal Data, and your consents herein are additional to any rights
+          which any member of WellAI may have at law to collect, use, or
+          disclose your Personal Data. Please note that WellAI may amend this
+          Privacy Notice at any time without prior notice and will notify you of
+          any such amendment via our website or by email.
         </Typography>
 
         <Typography sx={{ fontWeight: 600, mb: 1 }}>1. Definitions</Typography>
         <Typography sx={{ mb: 3 }}>
-          1.1. WellAI: Refers to WellAI Sdn Bhd, its affiliates, subsidiaries, associated entities, including but not limited to any of their branches and offices.
-          1.2. Personal Data: Includes information such as name, age, gender, identity card number, passport number, date of birth, education, race, ethnic origin, nationality, contact details, family information, occupation details, medical and personal health information, demographic information, device information, device location, payment card number and expiry date, billing address, loyalty program membership details, photographs, video and audio, CCTV recordings and other images, preferences and interests, financial details, and any other information relevant to services provided.
+          1.1. WellAI: Refers to WellAI Sdn Bhd, its affiliates, subsidiaries,
+          associated entities, including but not limited to any of their
+          branches and offices. 1.2. Personal Data: Includes information such as
+          name, age, gender, identity card number, passport number, date of
+          birth, education, race, ethnic origin, nationality, contact details,
+          family information, occupation details, medical and personal health
+          information, demographic information, device information, device
+          location, payment card number and expiry date, billing address,
+          loyalty program membership details, photographs, video and audio, CCTV
+          recordings and other images, preferences and interests, financial
+          details, and any other information relevant to services provided.
         </Typography>
 
-        <Typography sx={{ fontWeight: 600, mb: 2 }}>2. Information Collection</Typography>
+        <Typography sx={{ fontWeight: 600, mb: 2 }}>
+          2. Information Collection
+        </Typography>
         <Typography sx={{ mb: 3 }}>
-          2.1. We may collect Personal Data directly from you or from third parties, including but not limited to online forms, mobile applications, website, email, agreements, name cards, browser, files in media or storage, social medias, or any identity materials that you have distributed voluntarily.
-          2.2. Information collected may include personal details, contact details, medical history, device information, and more. Providing obligatory information is necessary for the provision of services.
+          2.1. We may collect Personal Data directly from you or from third
+          parties, including but not limited to online forms, mobile
+          applications, website, email, agreements, name cards, browser, files
+          in media or storage, social medias, or any identity materials that you
+          have distributed voluntarily. 2.2. Information collected may include
+          personal details, contact details, medical history, device
+          information, and more. Providing obligatory information is necessary
+          for the provision of services.
         </Typography>
 
-        <Typography sx={{ fontWeight: 600, mb: 1 }}>3. Use of Information</Typography>
+        <Typography sx={{ fontWeight: 600, mb: 1 }}>
+          3. Use of Information
+        </Typography>
         <Typography sx={{ mb: 3 }}>
-          3.1. The collected data may be used for various purposes including but not limited to processing medical services, administering services and events, processing payments, internal analysis, customer loyalty programmes, internal investigations, audit or security purposes, compliance with legal obligations, marketing and communication of relevant information.
+          3.1. The collected data may be used for various purposes including but
+          not limited to processing medical services, administering services and
+          events, processing payments, internal analysis, customer loyalty
+          programmes, internal investigations, audit or security purposes,
+          compliance with legal obligations, marketing and communication of
+          relevant information.
         </Typography>
 
-        <Typography sx={{ fontWeight: 600, mb: 1 }}>4. Disclosure of Information</Typography>
+        <Typography sx={{ fontWeight: 600, mb: 1 }}>
+          4. Disclosure of Information
+        </Typography>
         <Typography sx={{ mb: 3 }}>
-          4.1. Personal Data will be kept confidential but may be disclosed to relevant third parties, including other companies within the WellAI and relevant third parties (in or outside of Malaysia) as required under law, pursuant to the relevant contractual relationship or for purposes mentioned in paragraph 3 above.
-          4.2. WellAI may also disclose or transfer Personal Data in the event of any restructuring, sale, or acquisition of the respective companies.
-          4.3 Where WellAI deals with third parties, specific security and confidentiality safeguards will be put in place to ensure the personal data protection rights remain unaffected.
+          4.1. Personal Data will be kept confidential but may be disclosed to
+          relevant third parties, including other companies within the WellAI
+          and relevant third parties (in or outside of Malaysia) as required
+          under law, pursuant to the relevant contractual relationship or for
+          purposes mentioned in paragraph 3 above. 4.2. WellAI may also disclose
+          or transfer Personal Data in the event of any restructuring, sale, or
+          acquisition of the respective companies. 4.3 Where WellAI deals with
+          third parties, specific security and confidentiality safeguards will
+          be put in place to ensure the personal data protection rights remain
+          unaffected.
         </Typography>
 
         <Typography sx={{ fontWeight: 600, mb: 1 }}>5. Your Rights</Typography>
         <Typography sx={{ mb: 3 }}>
-          5.1. You have the right to request access, correction, updating, or deletion of your Personal Data. Requests can be made through the designated contact points provided including but not limited to online registered account or request to pdpa@wellai.app.
-          5.2. WellAI reserve the right to charge a fee for processing data access requests in accordance with PDPA.
+          5.1. You have the right to request access, correction, updating, or
+          deletion of your Personal Data. Requests can be made through the
+          designated contact points provided including but not limited to online
+          registered account or request to pdpa@wellai.app. 5.2. WellAI reserve
+          the right to charge a fee for processing data access requests in
+          accordance with PDPA.
         </Typography>
 
-        <Typography sx={{ fontWeight: 600, mb: 1 }}>6. Withdrawing Consent</Typography>
+        <Typography sx={{ fontWeight: 600, mb: 1 }}>
+          6. Withdrawing Consent
+        </Typography>
         <Typography sx={{ mb: 3 }}>
-          6.1. You are entitled to limit our processing of your personal data by expressly withdrawing in full, your consent given previously, in each case, including for direct marketing purposes subject to any applicable legal restrictions, contractual conditions, and within a reasonable amount of time period. You may opt out of receiving any communications from us at any time by:
-          6.1.1 following the opt-out instructions or by clicking on the “unsubscribe link” contained in each marketing communication;
-          6.1.2 editing the relevant account settings to unsubscribe; or
-          6.1.3 sending a request to pdpa@wellai.app.
+          6.1. You are entitled to limit our processing of your personal data by
+          expressly withdrawing in full, your consent given previously, in each
+          case, including for direct marketing purposes subject to any
+          applicable legal restrictions, contractual conditions, and within a
+          reasonable amount of time period. You may opt out of receiving any
+          communications from us at any time by: 6.1.1 following the opt-out
+          instructions or by clicking on the “unsubscribe link” contained in
+          each marketing communication; 6.1.2 editing the relevant account
+          settings to unsubscribe; or 6.1.3 sending a request to
+          pdpa@wellai.app.
         </Typography>
 
         <Typography sx={{ fontWeight: 600, mb: 1 }}>7. Complaints</Typography>
         <Typography sx={{ mb: 3 }}>
-          7.1. For any concerns or complaints regarding the use of Personal Data, you may contact the designated email address via pdpa@wellai.app.
+          7.1. For any concerns or complaints regarding the use of Personal
+          Data, you may contact the designated email address via
+          pdpa@wellai.app.
         </Typography>
 
         <Typography sx={{ fontWeight: 600, mb: 1 }}>8. Children</Typography>
         <Typography sx={{ mb: 3 }}>
-          8.1. Minors under the age of 18 may not use the respective websites or apps. WellAI does not knowingly collect personal information from anyone under the age of 18. No part of the website or application is designed to attract anyone under the age of 18. WellAI does not sell products and/or services for purchase by children. In certain instances, WellAI sells products and/or services for children but for purchase by adults.
-          8.2 Links to Third Party Website
-          Parts of our website may contain links to third party websites not owned by WellAI (“Third Party websites”). When you access a Third-Party website, please understand that we do not control the content of that Third Party website and are not responsible for the privacy practices or the content of that Third Party website. This Policy applies only to our site and you should be aware that other sites linked by this web site may have different privacy and personal data protection policies and we highly recommend that you read and understand the privacy statement of each site. We accept no responsibility or liability in respect of any such third-party materials or for the operation or content of other websites (whether or not linked to our website) which are not under WellAI's control.
+          8.1. Minors under the age of 18 may not use the respective websites or
+          apps. WellAI does not knowingly collect personal information from
+          anyone under the age of 18. No part of the website or application is
+          designed to attract anyone under the age of 18. WellAI does not sell
+          products and/or services for purchase by children. In certain
+          instances, WellAI sells products and/or services for children but for
+          purchase by adults. 8.2 Links to Third Party Website Parts of our
+          website may contain links to third party websites not owned by WellAI
+          (“Third Party websites”). When you access a Third-Party website,
+          please understand that we do not control the content of that Third
+          Party website and are not responsible for the privacy practices or the
+          content of that Third Party website. This Policy applies only to our
+          site and you should be aware that other sites linked by this web site
+          may have different privacy and personal data protection policies and
+          we highly recommend that you read and understand the privacy statement
+          of each site. We accept no responsibility or liability in respect of
+          any such third-party materials or for the operation or content of
+          other websites (whether or not linked to our website) which are not
+          under WellAI's control.
         </Typography>
 
-        <Typography sx={{ fontWeight: 600, mb: 1 }}>9. External Links</Typography>
+        <Typography sx={{ fontWeight: 600, mb: 1 }}>
+          9. External Links
+        </Typography>
         <Typography sx={{ mb: 3 }}>
-          9.1. The websites or apps may contain links to third-party websites. WellAI is not responsible for the privacy practices or content of these external sites.
+          9.1. The websites or apps may contain links to third-party websites.
+          WellAI is not responsible for the privacy practices or content of
+          these external sites.
         </Typography>
 
-        <Typography sx={{ fontWeight: 600, mb: 1 }}>10. Security Precautions</Typography>
+        <Typography sx={{ fontWeight: 600, mb: 1 }}>
+          10. Security Precautions
+        </Typography>
         <Typography sx={{ mb: 3 }}>
-          10.1. WellAI has stringent security measures in place to protect against unauthorized access, loss, misuse and alteration to Personal Data.
-          10.2 A "Force Majeure Event" shall mean any event that is beyond the reasonable control and shall include, without limitation, sabotage, fire, flood, explosion, acts of God, civil commotion, strikes or industrial action of any kind, riots, insurrection, war, acts of government, computer hacking, unauthorised access to computer data and storage device, computer crashes, breach of security and encryption, etc.
+          10.1. WellAI has stringent security measures in place to protect
+          against unauthorized access, loss, misuse and alteration to Personal
+          Data. 10.2 A "Force Majeure Event" shall mean any event that is beyond
+          the reasonable control and shall include, without limitation,
+          sabotage, fire, flood, explosion, acts of God, civil commotion,
+          strikes or industrial action of any kind, riots, insurrection, war,
+          acts of government, computer hacking, unauthorised access to computer
+          data and storage device, computer crashes, breach of security and
+          encryption, etc.
         </Typography>
 
-        <Typography sx={{ fontWeight: 600, mb: 1 }}>11. Changes to this Privacy Policy</Typography>
+        <Typography sx={{ fontWeight: 600, mb: 1 }}>
+          11. Changes to this Privacy Policy
+        </Typography>
         <Typography sx={{ mb: 3 }}>
-          11.1. WellAI reserves the right to update, change, or modify this Privacy Policy. Such changes will be effective from the date of the update. If You continue to use Your account and/or access the Website/App even after any such changes have been made, it would be deemed to be an implied consent to the changed policy.
+          11.1. WellAI reserves the right to update, change, or modify this
+          Privacy Policy. Such changes will be effective from the date of the
+          update. If You continue to use Your account and/or access the
+          Website/App even after any such changes have been made, it would be
+          deemed to be an implied consent to the changed policy.
         </Typography>
 
-        <Typography sx={{ fontWeight: 600, mb: 1 }}>12. Cookies and Other Tracking Technologies</Typography>
+        <Typography sx={{ fontWeight: 600, mb: 1 }}>
+          12. Cookies and Other Tracking Technologies
+        </Typography>
         <Typography sx={{ mb: 3 }}>
-          12.1. The websites or apps may use cookies and tracking technologies to collect information about user activity for analysis and customization of user experience. A "cookie" is a small text file that may be used, for example, to collect information about Site activity. Some cookies and other technologies may serve to recall Personal Information previously indicated by a Web user. Most browsers allow You to control cookies, including whether or not to accept them and how to remove them.
-          12.2 Tracking technologies may record information such as Internet domain and host names; Internet protocol (IP) addresses; browser software and operating system types; stream patterns; and dates and times that our website or application is accessed. Our use of cookies and other tracking technologies allows WellAIs to improve our website, application and user experience. We may also analyze information that does not contain Personal Information for trends and statistics.
+          12.1. The websites or apps may use cookies and tracking technologies
+          to collect information about user activity for analysis and
+          customization of user experience. A "cookie" is a small text file that
+          may be used, for example, to collect information about Site activity.
+          Some cookies and other technologies may serve to recall Personal
+          Information previously indicated by a Web user. Most browsers allow
+          You to control cookies, including whether or not to accept them and
+          how to remove them. 12.2 Tracking technologies may record information
+          such as Internet domain and host names; Internet protocol (IP)
+          addresses; browser software and operating system types; stream
+          patterns; and dates and times that our website or application is
+          accessed. Our use of cookies and other tracking technologies allows
+          WellAIs to improve our website, application and user experience. We
+          may also analyze information that does not contain Personal
+          Information for trends and statistics.
         </Typography>
 
-        <Typography sx={{ fontWeight: 600, mb: 1 }}>13. Data Transfer and Sharing</Typography>
+        <Typography sx={{ fontWeight: 600, mb: 1 }}>
+          13. Data Transfer and Sharing
+        </Typography>
         <Typography sx={{ mb: 3 }}>
-          13.1. Personal Data may be transferred to third parties, including within the respective group of companies or any third party service or product providers within or outside the country, for purposes of data storage, processing, and service provision.
+          13.1. Personal Data may be transferred to third parties, including
+          within the respective group of companies or any third party service or
+          product providers within or outside the country, for purposes of data
+          storage, processing, and service provision.
         </Typography>
 
         <Typography sx={{ fontWeight: 600, mb: 1 }}>14. Indemnity</Typography>
         <Typography sx={{ mb: 3 }}>
-          14.1. Users agree to indemnify WellAI against any disputes arising from the disclosure of Personal Information to third parties either through WellAI website or application or otherwise. We assume no liability for any actions of third parties with regard to the Personal Data, which you may have disclosed to such third parties.
+          14.1. Users agree to indemnify WellAI against any disputes arising
+          from the disclosure of Personal Information to third parties either
+          through WellAI website or application or otherwise. We assume no
+          liability for any actions of third parties with regard to the Personal
+          Data, which you may have disclosed to such third parties.
         </Typography>
 
-        <Typography sx={{ fontWeight: 600, mb: 1 }}>15. Severability</Typography>
+        <Typography sx={{ fontWeight: 600, mb: 1 }}>
+          15. Severability
+        </Typography>
         <Typography sx={{ mb: 3 }}>
-          15.1. Each paragraph of this Privacy Policy is separate and independent. Nullification of one paragraph does not affect the other paragraphs herein except where otherwise expressly indicated or indicated by the context of the agreement.
+          15.1. Each paragraph of this Privacy Policy is separate and
+          independent. Nullification of one paragraph does not affect the other
+          paragraphs herein except where otherwise expressly indicated or
+          indicated by the context of the agreement.
         </Typography>
 
-        <Typography sx={{ fontWeight: 600, mb: 1 }}>16. Contact Information</Typography>
+        <Typography sx={{ fontWeight: 600, mb: 1 }}>
+          16. Contact Information
+        </Typography>
         <Typography sx={{ mb: 3 }}>
-          16.1. For any feedback or comments about this Privacy Policy, you may contact the designated email address via pdpa@wellai.app.
+          16.1. For any feedback or comments about this Privacy Policy, you may
+          contact the designated email address via pdpa@wellai.app.
         </Typography>
 
         <Box sx={{ textAlign: "center" }}>
-          <Button onClick={onClose}>
-            Close
-          </Button>
+          <Button onClick={onClose}>Close</Button>
         </Box>
       </DialogContent>
     </Dialog>
   );
 };
 
-export default PrivacyNotice;
\ No newline at end of file
+export default PrivacyNotice;
diff --git a/client/src/components/ReportTemplate.js b/client/src/components/ReportTemplate.js
index 9df107ab..f987e123 100644
--- a/client/src/components/ReportTemplate.js
+++ b/client/src/components/ReportTemplate.js
@@ -11,6 +11,15 @@ import {
   useMediaQuery,
 } from "@mui/material";
 
+/**
+ * A template that can be filled in with health data from generated from
+ * reports and displays them in a readable format.
+ *
+ * @param {Object} props
+ * @param {Object} [props.report] - Health data in the report.
+ * @param {Object} [props.date] - Date the report was generated.
+ * @returns {@mui.material.Box}
+ */
 const ReportTemplate = ({ report, date }) => {
   const theme = useTheme();
   const isMobile = useMediaQuery(theme.breakpoints.down("sm"));
diff --git a/client/src/components/RequestPatientAccessForm.js b/client/src/components/RequestPatientAccessForm.js
index 269ff178..53653fdd 100644
--- a/client/src/components/RequestPatientAccessForm.js
+++ b/client/src/components/RequestPatientAccessForm.js
@@ -15,6 +15,8 @@ const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
 
 /**
  * Provides a merchant user with a form to send an access request to an existing patient.
+ *
+ * @returns {@mui.material.Container}
  */
 const RequestPatientAccessForm = () => {
   const [email, setEmail] = useState(null);
diff --git a/client/src/components/WelcomePanel.js b/client/src/components/WelcomePanel.js
index 4137a6ee..f75c52a2 100644
--- a/client/src/components/WelcomePanel.js
+++ b/client/src/components/WelcomePanel.js
@@ -2,7 +2,10 @@ import { Box, Container, Stack, Typography } from "@mui/material";
 import Logo from "../assets/WellAiLogoTR.png";
 
 /**
- * An panel that introduce the web service.
+ * A panel that displays the name of the web application and the
+ * company's logo as an introduction to the web application.
+ *
+ * @returns {@mui.material.Container}
  */
 const WelcomePanel = () => {
   return (
diff --git a/client/src/components/administrator/AccountApprovalTable.js b/client/src/components/administrator/AccountApprovalTable.js
index 58a490b8..9b2ae6cc 100644
--- a/client/src/components/administrator/AccountApprovalTable.js
+++ b/client/src/components/administrator/AccountApprovalTable.js
@@ -5,6 +5,11 @@ import ConfirmationDialog from "../confirmationDialog";
 
 const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
 
+/**
+ * A table that lists the merchant accounts awaiting approval by an administrator.
+ *
+ * @returns {@mui.material.Box}
+ */
 const AccountApprovalTable = ({}) => {
   const [userData, setUserData] = useState([]); // Stores user data
   const [selectedUser, setselectedUser] = useState(); // Stores the selected user
@@ -49,9 +54,27 @@ const AccountApprovalTable = ({}) => {
   };
 
   const columns = [
-    { field: "email", headerName: "Email", flex: 2, width: 250, sortable: true },
-    { field: "fullName", headerName: "Full Name", flex: 1.5, width: 250, sortable: true },
-    { field: "createdAt", headerName: "Created At", flex: 1.2, width: 200, sortable: true },
+    {
+      field: "email",
+      headerName: "Email",
+      flex: 2,
+      width: 250,
+      sortable: true,
+    },
+    {
+      field: "fullName",
+      headerName: "Full Name",
+      flex: 1.5,
+      width: 250,
+      sortable: true,
+    },
+    {
+      field: "createdAt",
+      headerName: "Created At",
+      flex: 1.2,
+      width: 200,
+      sortable: true,
+    },
     {
       field: "confirm",
       headerName: "Confirm",
diff --git a/client/src/components/administrator/AuditLogSearchBar.js b/client/src/components/administrator/AuditLogSearchBar.js
index 82461176..b98af4f3 100644
--- a/client/src/components/administrator/AuditLogSearchBar.js
+++ b/client/src/components/administrator/AuditLogSearchBar.js
@@ -2,6 +2,18 @@ import SearchIcon from "@mui/icons-material/Search";
 import { TextField, InputAdornment, Box } from "@mui/material";
 import { memo, useEffect, useState } from "react";
 
+/**
+ * A search bar that is used as an element in the AuditLogTable to filter
+ * the data inside of it.
+ *
+ * @param {Object} props
+ * @param {function} [props.onSearchChange] - Callback function for changes
+ * in search criteria
+ * @param {int} [props.delay] - Millisecond delay before calling onSearchChange
+ * callback
+ * @param {string} [props.placeholder] - Placeholder text in search bar
+ * @returns {@mui.material.Box}
+ */
 const AuditLogSearchBar = ({ onSearchChange, delay = 500, placeholder }) => {
   const [value, setValue] = useState("");
 
diff --git a/client/src/components/administrator/AuditLogTable.js b/client/src/components/administrator/AuditLogTable.js
index 131435ce..7e4c241e 100644
--- a/client/src/components/administrator/AuditLogTable.js
+++ b/client/src/components/administrator/AuditLogTable.js
@@ -31,6 +31,12 @@ const EVENT_TYPES = [
   "PATIENT_PROFILE_UPDATED",
 ];
 
+/**
+ * A table that lists the system's audit logs with the tools to filter
+ * them efficiently.
+ *
+ * @returns {@mui.material.Box}
+ */
 const AuditLogTable = () => {
   const [logData, setLogData] = useState([]);
   const [totalLogs, setTotalLogs] = useState(0);
@@ -81,7 +87,13 @@ const AuditLogTable = () => {
 
   useEffect(() => {
     fetchLogs();
-  }, [paginationModel.page, paginationModel.pageSize, userEmail, eventType, sortModel]);
+  }, [
+    paginationModel.page,
+    paginationModel.pageSize,
+    userEmail,
+    eventType,
+    sortModel,
+  ]);
 
   const handleEmailSearchChange = useCallback((value) => {
     setPaginationModel((prev) => ({ ...prev, page: 0 }));
@@ -94,14 +106,62 @@ const AuditLogTable = () => {
   }, []);
 
   const columns = [
-    { field: "logID", headerName: "Log ID", flex: 0.7, width: 70, sortable: true },
-    { field: "eventType", headerName: "Event Type", flex: 1, minWidth: 140, sortable: true },
-    { field: "success", headerName: "Success", width: 80, type: "boolean", sortable: true },
-    { field: "userEmail", headerName: "User Email", flex: 1.5, minWidth: 180, sortable: true },
-    { field: "ipAddress", headerName: "IP Address", flex: 0.8, minWidth: 100, sortable: true },
-    { field: "device", headerName: "Device", flex: 1, minWidth: 120, sortable: false },
-    { field: "createdAt", headerName: "Created At", flex: 1, minWidth: 160, sortable: true },
-    { field: "description", headerName: "Description", flex: 2, minWidth: 200, sortable: false },
+    {
+      field: "logID",
+      headerName: "Log ID",
+      flex: 0.7,
+      width: 70,
+      sortable: true,
+    },
+    {
+      field: "eventType",
+      headerName: "Event Type",
+      flex: 1,
+      minWidth: 140,
+      sortable: true,
+    },
+    {
+      field: "success",
+      headerName: "Success",
+      width: 80,
+      type: "boolean",
+      sortable: true,
+    },
+    {
+      field: "userEmail",
+      headerName: "User Email",
+      flex: 1.5,
+      minWidth: 180,
+      sortable: true,
+    },
+    {
+      field: "ipAddress",
+      headerName: "IP Address",
+      flex: 0.8,
+      minWidth: 100,
+      sortable: true,
+    },
+    {
+      field: "device",
+      headerName: "Device",
+      flex: 1,
+      minWidth: 120,
+      sortable: false,
+    },
+    {
+      field: "createdAt",
+      headerName: "Created At",
+      flex: 1,
+      minWidth: 160,
+      sortable: true,
+    },
+    {
+      field: "description",
+      headerName: "Description",
+      flex: 2,
+      minWidth: 200,
+      sortable: false,
+    },
   ];
 
   return (
@@ -128,9 +188,10 @@ const AuditLogTable = () => {
         />
         <Divider
           orientation="vertical"
-          flexItem sx={{
+          flexItem
+          sx={{
             display: { xs: "none", md: "block" },
-            }} 
+          }}
         />
         <Divider
           sx={{
@@ -150,7 +211,7 @@ const AuditLogTable = () => {
           <FormControl
             size="small"
             sx={{
-              width: { xs: "100%", sm: 250 }
+              width: { xs: "100%", sm: 250 },
             }}
           >
             <InputLabel id="event-type-label">Filter by Event Type</InputLabel>
@@ -174,11 +235,10 @@ const AuditLogTable = () => {
             </Select>
           </FormControl>
         </Box>
-
       </Paper>
 
       <Paper sx={{ width: "100%", overflow: "hidden" }}>
-        <Box sx={{ width: "100%", overflowX: "auto"}}>
+        <Box sx={{ width: "100%", overflowX: "auto" }}>
           <DataGrid
             rows={logData}
             columns={columns}
@@ -198,7 +258,7 @@ const AuditLogTable = () => {
               },
             }}
           />
-          </Box>
+        </Box>
       </Paper>
     </Box>
   );
diff --git a/client/src/components/administrator/UserManagementTable.js b/client/src/components/administrator/UserManagementTable.js
index d3c72852..0a9ae480 100644
--- a/client/src/components/administrator/UserManagementTable.js
+++ b/client/src/components/administrator/UserManagementTable.js
@@ -1,4 +1,12 @@
-import { Paper, Box, Snackbar, Alert, Stack, Typography, Divider } from "@mui/material";
+import {
+  Paper,
+  Box,
+  Snackbar,
+  Alert,
+  Stack,
+  Typography,
+  Divider,
+} from "@mui/material";
 import { DataGrid } from "@mui/x-data-grid";
 import { useState, useEffect, useCallback } from "react";
 import ConfirmationDialog from "../confirmationDialog";
@@ -6,6 +14,13 @@ import UserSearchBar from "./UserSearchBar";
 import UserToolBar from "./UserToolBar";
 import * as React from "react";
 
+/**
+ * A table listing all the user accounts in the system with tools to search
+ * and filter through them. It details the account's email, full name,
+ * creation date, validation status, and role.
+ *
+ * @returns {@mui.material.Box}
+ */
 const UserManagementTable = () => {
   const [userData, setUserData] = useState([]); // Stores user data
   const [totalUsers, setTotalUsers] = useState(0);
@@ -49,7 +64,7 @@ const UserManagementTable = () => {
     if (selectedClinic) {
       params.append("clinic_id", selectedClinic);
     }
-      
+
     // Append sort params when sort is active
     if (sortModel.length > 0) {
       params.append("sort_by", sortModel[0].field);
@@ -103,7 +118,7 @@ const UserManagementTable = () => {
       });
   }, [API_BASE]);
 
-    useEffect(() => {
+  useEffect(() => {
     fetch(`${API_BASE}/clinics`)
       .then((response) => {
         if (!response.ok) {
@@ -117,7 +132,6 @@ const UserManagementTable = () => {
       });
   }, [API_BASE]);
 
-
   const confirmRoleChange = async (e) => {
     e.preventDefault();
     const emails = getSelectedEmails();
@@ -229,11 +243,42 @@ const UserManagementTable = () => {
   }, []);
 
   const columns = [
-    { field: "email", headerName: "Email", flex: 2, width: 250, sortable: true },
-    { field: "fullName", headerName: "Full Name", flex: 1.5, width: 250, sortable: false },
-    { field: "createdAt", headerName: "Created At", flex: 1.2, width: 200, sortable: true },
-    { field: "validated", headerName: "Validation Status", flex: 1, width: 150, sortable: true },
-    { field: "role", headerName: "Role", flex: 1.3, width: 220, sortable: false, valueGetter: (params) => params?.name },
+    {
+      field: "email",
+      headerName: "Email",
+      flex: 2,
+      width: 250,
+      sortable: true,
+    },
+    {
+      field: "fullName",
+      headerName: "Full Name",
+      flex: 1.5,
+      width: 250,
+      sortable: false,
+    },
+    {
+      field: "createdAt",
+      headerName: "Created At",
+      flex: 1.2,
+      width: 200,
+      sortable: true,
+    },
+    {
+      field: "validated",
+      headerName: "Validation Status",
+      flex: 1,
+      width: 150,
+      sortable: true,
+    },
+    {
+      field: "role",
+      headerName: "Role",
+      flex: 1.3,
+      width: 220,
+      sortable: false,
+      valueGetter: (params) => params?.name,
+    },
   ];
 
   return (
@@ -247,11 +292,12 @@ const UserManagementTable = () => {
       }}
     >
       <Box>
-        <Paper sx={{
-          mb: "16px",
-          display: "flex",
-          flexDirection: { xs: "column", md: "row" },
-          alignItems: { md: "center" },
+        <Paper
+          sx={{
+            mb: "16px",
+            display: "flex",
+            flexDirection: { xs: "column", md: "row" },
+            alignItems: { md: "center" },
           }}
         >
           <UserSearchBar
@@ -260,29 +306,30 @@ const UserManagementTable = () => {
             delay={400}
           />
           <Divider
-          orientation="vertical"
-          flexItem sx={{
-            display: { xs: "none", md: "block" },
-            }} 
+            orientation="vertical"
+            flexItem
+            sx={{
+              display: { xs: "none", md: "block" },
+            }}
           />
           <Divider
             sx={{
               display: { xs: "block", md: "none" },
             }}
           />
-            <UserToolBar
-              rowSelectionModel={rowSelectionModel}
-              totalRowCount={totalUsers}
-              onUsersDelete={handleUsersDelete}
-              onUsersRoleChange={handleUsersRoleChange}
-              onClinicChange={handleClinicChange}
-              roleData={roleData}
-              clinicData={clinicData}
-              selectedClinic={selectedClinic}
-            />
+          <UserToolBar
+            rowSelectionModel={rowSelectionModel}
+            totalRowCount={totalUsers}
+            onUsersDelete={handleUsersDelete}
+            onUsersRoleChange={handleUsersRoleChange}
+            onClinicChange={handleClinicChange}
+            roleData={roleData}
+            clinicData={clinicData}
+            selectedClinic={selectedClinic}
+          />
         </Paper>
         <Paper sx={{ width: "100%", overflow: "hidden" }}>
-          <Box sx={{ width: "100%", overflowX: "auto"}}>
+          <Box sx={{ width: "100%", overflowX: "auto" }}>
             <DataGrid
               loading={loading}
               onRowSelectionModelChange={(newSelection) =>
diff --git a/client/src/components/administrator/UserSearchBar.js b/client/src/components/administrator/UserSearchBar.js
index e4f1b7e7..bc72c3ed 100644
--- a/client/src/components/administrator/UserSearchBar.js
+++ b/client/src/components/administrator/UserSearchBar.js
@@ -3,6 +3,16 @@ import { TextField, Box } from "@mui/material";
 import InputAdornment from "@mui/material/InputAdornment";
 import { useEffect, useState, memo } from "react";
 
+/**
+ * A search bar that is used as an element in the UserManagementTable to
+ * filter the data inside of it.
+ *
+ * @param {Object} props
+ * @param {function} [props.onSearchChange] - Callback function for changes in search criteria.
+ * @param {int} [props.delay] - Millisecond delay before calling onSearchChange callback.
+ * @param {string} [props.placeholder] - Placeholder text in search bar.
+ * @returns {@mui.material.Box}
+ */
 const UserSearchBar = ({ placeholder, onSearchChange, delay = 400 }) => {
   const [inputValue, setInputValue] = useState("");
 
diff --git a/client/src/components/administrator/UserToolBar.js b/client/src/components/administrator/UserToolBar.js
index 7092f49c..e57404a7 100644
--- a/client/src/components/administrator/UserToolBar.js
+++ b/client/src/components/administrator/UserToolBar.js
@@ -1,6 +1,24 @@
 import { Box, Select, Button, MenuItem } from "@mui/material";
 import DeleteForeverIcon from "@mui/icons-material/DeleteForever";
 
+/**
+ * A tool bar to that provides the controls for modifying and filtering user
+ * data including deletion, role changing, and clinic filtering. This
+ * component is designed to be used with the UserManagementTable.
+ *
+ * @param {Object} props
+ * @param {Object} [props.rowSelectionModel]
+ * @param {string} [props.rowSelectionModel.type] - "include" or "exclude" selection.
+ * @param {Set} [props.rowSelectionModel.ids] - User ID's that are selected
+ * @param {int} [props.totalRowCount] - Number of rows when selection type is "exclude"
+ * @param {function} [props.onUsersDelete] - Callback function for deleting user
+ * @param {function} [props.onUsersRoleChange] - Callback function for changing user role
+ * @param {function} [props.onClinicChange] - Callback function for changing clinic
+ * @param {Object} [props.roleData] - A list of all roles in the system and their ID
+ * @param {Object} [props.clinicData] - A list of all clinics in the system and their ID
+ * @param {int} [props.selectedClinic] - ID of the selected clinic
+ * @returns {@mui.material.Box}
+ */
 const UserToolBar = ({
   rowSelectionModel,
   totalRowCount,
@@ -39,12 +57,10 @@ const UserToolBar = ({
         value={selectedClinic}
         onChange={(e) => onClinicChange(e.target.value)}
         sx={{
-          width: { xs: "100%", sm:200},
+          width: { xs: "100%", sm: 200 },
         }}
       >
-        <MenuItem value="">
-          All Clinics
-        </MenuItem>
+        <MenuItem value="">All Clinics</MenuItem>
         {clinicData.map((clinic) => (
           <MenuItem key={clinic.id} value={clinic.id}>
             {clinic.name}
@@ -58,7 +74,7 @@ const UserToolBar = ({
         value=""
         onChange={(e) => onUsersRoleChange(e.target.value)}
         sx={{
-          width: { xs: "100%", sm: "auto" }
+          width: { xs: "100%", sm: "auto" },
         }}
       >
         <MenuItem value="" disabled>
@@ -77,7 +93,7 @@ const UserToolBar = ({
         disabled={emailCount === 0}
         onClick={onUsersDelete}
         sx={{
-          width: { xs: "100%", sm: "auto" }
+          width: { xs: "100%", sm: "auto" },
         }}
       >
         <DeleteForeverIcon /> Delete Selected
diff --git a/client/src/components/administrator/analytics/ActiveMerchantsAnalytics.js b/client/src/components/administrator/analytics/ActiveMerchantsAnalytics.js
index f6b6960d..cec30903 100644
--- a/client/src/components/administrator/analytics/ActiveMerchantsAnalytics.js
+++ b/client/src/components/administrator/analytics/ActiveMerchantsAnalytics.js
@@ -12,8 +12,10 @@ import { useEffect, useState } from "react";
 const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
 
 /**
- * Displays the amount of merchants that have logged into the system over the
- * past month and past week.
+ * A card that displays the amount of merchants that have logged into the
+ * system over the past month and past week.
+ *
+ * @returns {@mui.material.Card}
  */
 const ActiveMerchantsAnalytics = () => {
   const [data, setData] = useState({});
diff --git a/client/src/components/administrator/analytics/ActiveUsersAnalytics.js b/client/src/components/administrator/analytics/ActiveUsersAnalytics.js
index a394f804..782c02bc 100644
--- a/client/src/components/administrator/analytics/ActiveUsersAnalytics.js
+++ b/client/src/components/administrator/analytics/ActiveUsersAnalytics.js
@@ -12,8 +12,10 @@ import { useEffect, useState } from "react";
 const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
 
 /**
- * Displays the amount of standard users that have logged into the system over the
- * past month and past week.
+ * A card that displays the amount of standard users that have logged into
+ * the system over the past month and past week.
+ *
+ * @returns {@mui.material.Card}
  */
 const ActiveUsersAnalytics = () => {
   const [data, setData] = useState({});
diff --git a/client/src/components/administrator/analytics/AverageRiskSeriesAnalytics.js b/client/src/components/administrator/analytics/AverageRiskSeriesAnalytics.js
index 225c747a..b2351026 100644
--- a/client/src/components/administrator/analytics/AverageRiskSeriesAnalytics.js
+++ b/client/src/components/administrator/analytics/AverageRiskSeriesAnalytics.js
@@ -20,8 +20,10 @@ const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
 const DEFAULT_YEAR = 2026;
 
 /**
- * Displays the average progression for stroke, diabetes, and cardiovascular
- * disease of the years.
+ * A card that displays the average progression for stroke, diabetes,
+ * and cardiovascular disease of the years.
+ *
+ * @returns {@mui.material.Card}
  */
 const AverageRiskSeriesAnalytics = () => {
   const [availableYears, setAvailableYears] = useState([]);
diff --git a/client/src/components/administrator/analytics/LoginActivityAnalytics.js b/client/src/components/administrator/analytics/LoginActivityAnalytics.js
index 961ec0d5..32b816a3 100644
--- a/client/src/components/administrator/analytics/LoginActivityAnalytics.js
+++ b/client/src/components/administrator/analytics/LoginActivityAnalytics.js
@@ -21,7 +21,9 @@ const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
 const TIMESPAN_IN_DAYS = 7;
 
 /**
- * Displays the number of logins over the past seven days.
+ * A card that displays the number of logins over the past seven days.
+ *
+ * @returns {@mui.material.Card}
  */
 const LoginActivityAnalytics = () => {
   const [xAxisData, setXAxisData] = useState([]);
diff --git a/client/src/components/administrator/analytics/PendingMerchantsAnalytics.js b/client/src/components/administrator/analytics/PendingMerchantsAnalytics.js
index a8ca645c..0af169c0 100644
--- a/client/src/components/administrator/analytics/PendingMerchantsAnalytics.js
+++ b/client/src/components/administrator/analytics/PendingMerchantsAnalytics.js
@@ -13,7 +13,9 @@ import ErrorIcon from "@mui/icons-material/Error";
 const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
 
 /**
- * Displays the amount of merchants awaiting approval from a moderator.
+ * A card that displays the amount of merchants awaiting approval from a moderator.
+ *
+ * @returns {@mui.material.Card}
  */
 const PendingMerchantsAnalytics = () => {
   const [data, setData] = useState({});
diff --git a/client/src/components/administrator/analytics/RecentReportsGeneratedAnalytics.js b/client/src/components/administrator/analytics/RecentReportsGeneratedAnalytics.js
index b098cec6..8981e19b 100644
--- a/client/src/components/administrator/analytics/RecentReportsGeneratedAnalytics.js
+++ b/client/src/components/administrator/analytics/RecentReportsGeneratedAnalytics.js
@@ -12,8 +12,10 @@ import { useEffect, useState } from "react";
 const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
 
 /**
- * Displays the amount of health reports that have been generated over the
- * past month and past week.
+ * A card that displays the amount of health reports that have been
+ * generated over the past month and past week.
+ *
+ * @returns {@mui.material.Card}
  */
 const RecentReportsGeneratedAnalytics = () => {
   const [data, setData] = useState({});
diff --git a/client/src/components/administrator/analytics/UnvalidatedAccountAnalytics.js b/client/src/components/administrator/analytics/UnvalidatedAccountAnalytics.js
index 940005f1..cc5b4d90 100644
--- a/client/src/components/administrator/analytics/UnvalidatedAccountAnalytics.js
+++ b/client/src/components/administrator/analytics/UnvalidatedAccountAnalytics.js
@@ -12,7 +12,9 @@ import { useEffect, useState } from "react";
 const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
 
 /**
- * Displays the number of unvalidated user accounts in the system.
+ * A card that displays the number of unvalidated user accounts in the system.
+ *
+ * @returns {@mui.material.Card}
  */
 const UnvalidatedAccountAnalytics = () => {
   const [data, setData] = useState({});
diff --git a/client/src/components/administrator/analytics/UserAccountAnalytics.js b/client/src/components/administrator/analytics/UserAccountAnalytics.js
index 234038fe..48d41840 100644
--- a/client/src/components/administrator/analytics/UserAccountAnalytics.js
+++ b/client/src/components/administrator/analytics/UserAccountAnalytics.js
@@ -13,7 +13,11 @@ import { useEffect, useState } from "react";
 const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
 
 /**
- * Displays general account information in the system.
+ * A card that displays general information about the users in the system.
+ * This includes the total number of accounts, how they are distributed
+ * between standard and merchant accounts, and the total number of patients.
+ *
+ * @returns {@mui.material.Card}
  */
 const UserAccountAnalytics = () => {
   const [data, setData] = useState({});
diff --git a/client/src/components/authentication/CreatePatientForm.js b/client/src/components/authentication/CreatePatientForm.js
index cfb31db7..ee30e215 100644
--- a/client/src/components/authentication/CreatePatientForm.js
+++ b/client/src/components/authentication/CreatePatientForm.js
@@ -20,9 +20,14 @@ import {
 } from "@mui/material";
 
 const FULL_NAME_MAX_LENGTH = 255;
-
 const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
 
+/**
+ * A form that contains all the necessary fields and functionality
+ * for the creation of a new patient.
+ *
+ * @returns {@mui.material.Paper}
+ */
 const CreatePatientForm = () => {
   const navigate = useNavigate();
   const [givenNames, setGivenNames] = useState(null);
@@ -169,7 +174,7 @@ const CreatePatientForm = () => {
         if (!response.ok) {
           setShowFailMessage(true);
           setShowSuccessMessage(false);
-          return
+          return;
         }
         setShowSuccessMessage(true);
         setShowFailMessage(false);
@@ -205,7 +210,8 @@ const CreatePatientForm = () => {
           <Stack spacing={1} sx={{ textAlign: "center" }}>
             <Typography variant="h4">Create Patient</Typography>
             <Typography variant="body2" color="text.secondary">
-              Register a patient profile to enable adding health records for them.
+              Register a patient profile to enable adding health records for
+              them.
             </Typography>
           </Stack>
 
diff --git a/client/src/components/authentication/EmailInputField.js b/client/src/components/authentication/EmailInputField.js
index 93ffafef..6a992aec 100644
--- a/client/src/components/authentication/EmailInputField.js
+++ b/client/src/components/authentication/EmailInputField.js
@@ -6,8 +6,11 @@ import validator from "validator";
  * An input field that provides basic validation for an entered email.
  *
  * @param {Object} props
- * @param {function} [props.onChange] - Callback function called when input is changed.
- * @param {boolean} [props.showRequired] - Force the component to show the error state.
+ * @param {function} [props.onChange] - Callback function called when
+ * input is changed.
+ * @param {boolean} [props.showRequired] - Force the component to show
+ * the error state.
+ * @returns {@mui.material.TextField}
  */
 const EmailInputField = ({ onChange, showRequired = false }) => {
   const [email, setEmail] = useState("");
diff --git a/client/src/components/authentication/ForgotPasswordForm.js b/client/src/components/authentication/ForgotPasswordForm.js
index 3c3b6796..a4ca8fa6 100644
--- a/client/src/components/authentication/ForgotPasswordForm.js
+++ b/client/src/components/authentication/ForgotPasswordForm.js
@@ -17,7 +17,9 @@ import Logo from "../../assets/WellAiLogoTR.png";
 const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
 
 /**
- * Provides the user a form to request a password reset using their email.
+ * A form that can be filled in by a user to submit a password reset request.
+ *
+ * @return {@mui.material.Card}
  */
 const ForgotPasswordForm = () => {
   const [email, setEmail] = useState(null);
diff --git a/client/src/components/authentication/LoginForm.js b/client/src/components/authentication/LoginForm.js
index 2cc8fc93..5d63ba58 100644
--- a/client/src/components/authentication/LoginForm.js
+++ b/client/src/components/authentication/LoginForm.js
@@ -19,8 +19,10 @@ import { UserContext } from "../../utils/UserContext";
 const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
 
 /**
- * Provides the user a form with the required fields and buttons to login to
- * the application.
+ * A form that can be filled in with a user's account credentials to login
+ * to the service.
+ *
+ * @returns {@mui.material.Card}
  */
 const LoginForm = () => {
   const navigate = useNavigate();
diff --git a/client/src/components/authentication/PasswordInputField.js b/client/src/components/authentication/PasswordInputField.js
index 6d42bcf2..d85347cf 100644
--- a/client/src/components/authentication/PasswordInputField.js
+++ b/client/src/components/authentication/PasswordInputField.js
@@ -10,6 +10,7 @@ import { TextField } from "@mui/material";
  *   outside the suitable length.
  * @param {boolean} [props.truncate] - Truncate the password in the onChange callback.
  * @param {boolean} [props.showRequired] - Force the component to show the error state.
+ * @returns {@mui.material.TextField}
  */
 const PasswordInputField = ({
   onChange,
diff --git a/client/src/components/authentication/PhoneInputField.js b/client/src/components/authentication/PhoneInputField.js
index 500ecdb2..21db14b5 100644
--- a/client/src/components/authentication/PhoneInputField.js
+++ b/client/src/components/authentication/PhoneInputField.js
@@ -12,7 +12,8 @@ import {
  *
  * @param {Object} props
  * @param {function} [props.onChange] - Callback function called when input
- *   is changed.
+ *  is changed.
+ * @returns {@mui.material.Box}
  */
 const PhoneInputField = ({ onChange }) => {
   const [rawPhoneNumber, setRawPhoneNumber] = useState("");
diff --git a/client/src/components/authentication/RegistrationForm.js b/client/src/components/authentication/RegistrationForm.js
index 08d71cb2..748feac8 100644
--- a/client/src/components/authentication/RegistrationForm.js
+++ b/client/src/components/authentication/RegistrationForm.js
@@ -35,6 +35,12 @@ const ACCOUNT_TYPES = Object.freeze({
 
 const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
 
+/**
+ * A form that can be filled out by a user to create an account with the
+ * service.
+ *
+ * @returns {@mui.material.Card}
+ */
 const RegistrationForm = () => {
   const navigate = useNavigate();
   const [givenNameState, setGivenNameState] = useState(null);
diff --git a/client/src/components/authentication/ResetPasswordForm.js b/client/src/components/authentication/ResetPasswordForm.js
index 6f78200a..22e84d10 100644
--- a/client/src/components/authentication/ResetPasswordForm.js
+++ b/client/src/components/authentication/ResetPasswordForm.js
@@ -18,7 +18,9 @@ import PasswordInputField from "../authentication/PasswordInputField";
 const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
 
 /**
- * Provides a form to reset their password one time with a reset token.
+ * A form to reset a user's password using a one-time reset token.
+ *
+ * @returns {@mui.material.Card}
  */
 const ResetPasswordForm = () => {
   const { token } = useParams();
diff --git a/client/src/components/confirmationDialog.js b/client/src/components/confirmationDialog.js
index b8b4ce05..4084f58c 100644
--- a/client/src/components/confirmationDialog.js
+++ b/client/src/components/confirmationDialog.js
@@ -7,17 +7,21 @@ import {
   Button,
 } from "@mui/material";
 
-// Reusable confirmation dialog with fully controlled content/styles by caller.
-// Props:
-// - open: boolean
-// - title: string | ReactNode
-// - message: string | ReactNode
-// - confirm: () => void
-// - cancel: () => void
-// - confirmText: string
-// - cancelText: string
-// - confirmColor: 'primary' | 'secondary' | 'error' | 'info' | 'success' | 'warning'
-// - cancelColor: same as above
+/**
+ * A confirmation dialog with fully controlled content/styles by caller.
+ *
+ * @param {Object} props
+ * @param {boolean} [props.open]
+ * @param {string | ReactNode} [props.title]
+ * @param {string | ReactNode} [props.message]
+ * @param {function} [props.confirm]
+ * @param {function} [props.cancel]
+ * @param {string} [props.confirmText]
+ * @param {string} [props.cancelText]
+ * @param {string} [props.confirmColor] primary, secondary, error, info, success, warning
+ * @param {string} [props.cancelColor] Same as above
+ * @returns {@mui.material.Dialog}
+ */
 const ConfirmationDialog = ({
   open,
   title,
diff --git a/client/src/routes/AcceptAccessRequest.js b/client/src/routes/AcceptAccessRequest.js
index 867b78d4..388ea533 100644
--- a/client/src/routes/AcceptAccessRequest.js
+++ b/client/src/routes/AcceptAccessRequest.js
@@ -10,7 +10,10 @@ import {
 import AcceptRequestForm from "../components/AcceptRequestForm";
 
 /**
- * Displays the form to accept an access request
+ * A page that displays the accept access request form for users to
+ * accept requests from merchants.
+ *
+ * @returns {@mui.material.Container}
  */
 const AcceptAccessRequest = () => {
   return (
diff --git a/client/src/routes/AdministratorApproval.js b/client/src/routes/AdministratorApproval.js
index 77caa26e..d1221ee5 100644
--- a/client/src/routes/AdministratorApproval.js
+++ b/client/src/routes/AdministratorApproval.js
@@ -1,12 +1,12 @@
 import AccountApprovalTable from "../components/administrator/AccountApprovalTable";
-import {
-  Box,
-  Typography,
-  Divider,
-  Stack,
-  Container
-} from "@mui/material";
+import { Box, Typography, Divider, Stack, Container } from "@mui/material";
 
+/**
+ * A route that displays the merchant approval table where administrators
+ * can audit and approve the creation of a merchant's account.
+ *
+ * @returns {@mui.material.Container}
+ */
 const AdministratorApproval = () => {
   return (
     <Container
@@ -26,7 +26,7 @@ const AdministratorApproval = () => {
           pb: { xs: "2px", sm: "0px", md: "4px" },
           pr: { xs: "2px", sm: "0px", md: "4px" },
           mr: "0px",
-          maxWidth: "1600px", 
+          maxWidth: "1600px",
         }}
       >
         <Stack spacing={1} sx={{ width: "100%", mb: 3 }}>
diff --git a/client/src/routes/AdministratorDashboard.js b/client/src/routes/AdministratorDashboard.js
index cda7d720..1514c5c2 100644
--- a/client/src/routes/AdministratorDashboard.js
+++ b/client/src/routes/AdministratorDashboard.js
@@ -21,6 +21,12 @@ import UserAccountAnalytics from "../components/administrator/analytics/UserAcco
 
 const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
 
+/**
+ * A route that displays a collection of metrics describing the current
+ * state of the system, it's users, and the health reports generated.
+ *
+ * @returns {@mui.material.Container}
+ */
 const AdministratorDashboard = () => {
   return (
     <Container
diff --git a/client/src/routes/AdministratorLogs.js b/client/src/routes/AdministratorLogs.js
index bd92ae47..15311038 100644
--- a/client/src/routes/AdministratorLogs.js
+++ b/client/src/routes/AdministratorLogs.js
@@ -1,13 +1,12 @@
 import AuditLogTable from "../components/administrator/AuditLogTable";
-import {
-  Box,
-  Typography,
-  Divider,
-  Stack,
-  Container
-} from "@mui/material";
+import { Box, Typography, Divider, Stack, Container } from "@mui/material";
 import AdministratorApproval from "./AdministratorApproval";
 
+/**
+ * A route that provides tools to filter through and audit the systems logs.
+ *
+ * @returns {@mui.material.Container}
+ */
 const AdministratorLogs = () => {
   return (
     <Container
@@ -27,7 +26,7 @@ const AdministratorLogs = () => {
           pb: { xs: "2px", sm: "0px", md: "4px" },
           pr: { xs: "2px", sm: "0px", md: "4px" },
           mr: "0px",
-          maxWidth: "1600px", 
+          maxWidth: "1600px",
         }}
       >
         <Stack spacing={1} sx={{ width: "100%", mb: 3 }}>
diff --git a/client/src/routes/AdministratorUsers.js b/client/src/routes/AdministratorUsers.js
index 8cfb58a6..f2993c17 100644
--- a/client/src/routes/AdministratorUsers.js
+++ b/client/src/routes/AdministratorUsers.js
@@ -1,12 +1,12 @@
 import UserManagementTable from "../components/administrator/UserManagementTable";
-import {
-  Box,
-  Typography,
-  Divider,
-  Stack,
-  Container
-} from "@mui/material";
+import { Box, Typography, Divider, Stack, Container } from "@mui/material";
 
+/**
+ * A route that provides tools to manage, filter and search through the users of the
+ * system. Facilitating the deletion or role changes for an account.
+ *
+ * @returns {@mui.material.Container}
+ */
 const AdministratorUsers = () => {
   return (
     <Container
diff --git a/client/src/routes/CreatePatient.js b/client/src/routes/CreatePatient.js
index 5a4c8213..8735ea67 100644
--- a/client/src/routes/CreatePatient.js
+++ b/client/src/routes/CreatePatient.js
@@ -6,7 +6,9 @@ const APPBAR_HEIGHT = { xs: "58px", sm: "66px" };
 const DRAWER_WIDTH = "65px";
 
 /**
- * A page used to create a new patient record.
+ * A page provides tools to create a new patient record.
+ *
+ * @returns {@mui.material.Box}
  */
 const CreatePatient = () => {
   return (
diff --git a/client/src/routes/ErrorPage.js b/client/src/routes/ErrorPage.js
index 3421526a..cd04b2ab 100644
--- a/client/src/routes/ErrorPage.js
+++ b/client/src/routes/ErrorPage.js
@@ -1,13 +1,13 @@
-import {
-  Typography,
-  Button,
-  Box,
-  Stack,
-} from "@mui/material";
+import { Typography, Button, Box, Stack } from "@mui/material";
 import { useNavigate } from "react-router-dom";
 import Logo from "../assets/WellAiLogoTR.png";
 
-
+/**
+ * A page that is displayed when a user tried to navigate a non-existent
+ * or malformed route.
+ *
+ * @returns {@mui.material.Container}
+ */
 const ErrorPage = () => {
   const navigate = useNavigate();
   return (
@@ -25,10 +25,7 @@ const ErrorPage = () => {
       }}
     >
       <Box>
-        <Typography
-          variant="h2"
-          sx={{ fontWeight: 500 }}
-        >
+        <Typography variant="h2" sx={{ fontWeight: 500 }}>
           Error 404
         </Typography>
         <Typography
@@ -36,17 +33,13 @@ const ErrorPage = () => {
           sx={{
             overflow: "hidden",
             px: { xs: 2, sm: 8 },
-            wordBreak: "break-word"
+            wordBreak: "break-word",
           }}
         >
           The requested URL cannot be found.
         </Typography>
       </Box>
-      <Button
-        onClick={() => navigate(-1)}
-        variant="contained"
-        size="large"
-      >
+      <Button onClick={() => navigate(-1)} variant="contained" size="large">
         Go Back
       </Button>
     </Stack>
diff --git a/client/src/routes/ForgotPassword.js b/client/src/routes/ForgotPassword.js
index 152e9f04..2fcd8744 100644
--- a/client/src/routes/ForgotPassword.js
+++ b/client/src/routes/ForgotPassword.js
@@ -2,7 +2,10 @@ import { Box, Container } from "@mui/material";
 import ForgotPasswordForm from "../components/authentication/ForgotPasswordForm";
 
 /**
- * Displays the form to reset a user's password if it has been forgotten.
+ * A route that provides the form for a user to reset their password by initiating
+ * the one-time password reset process.
+ *
+ * @returns {@mui.material.Container}
  */
 const ForgotPassword = () => {
   return (
diff --git a/client/src/routes/GenerateReport.js b/client/src/routes/GenerateReport.js
index 552ab5d2..63c32a5a 100644
--- a/client/src/routes/GenerateReport.js
+++ b/client/src/routes/GenerateReport.js
@@ -1,6 +1,11 @@
 import GenerateReportForm from "../components/GenerateReportForm";
 import { Box } from "@mui/material";
 
+/**
+ * A page that provides the form for user's to generate a health report.
+ *
+ * @returns {@mui.material.Box}
+ */
 const GenerateReport = ({}) => {
   return (
     <Box
diff --git a/client/src/routes/HealthAnalytics.js b/client/src/routes/HealthAnalytics.js
index 39fc7d4b..09d09742 100644
--- a/client/src/routes/HealthAnalytics.js
+++ b/client/src/routes/HealthAnalytics.js
@@ -49,6 +49,12 @@ const formatXAxisLabel = (label, index, total, isMobile) => {
   return label;
 };
 
+/**
+ * A page that displays the trends in the user's health based on
+ * their report history.
+ *
+ * @returns {@mui.material.Box}
+ */
 const HealthAnalytics = () => {
   const theme = useTheme();
   const isMobile = useMediaQuery(theme.breakpoints.down("sm"));
@@ -352,7 +358,9 @@ const HealthAnalytics = () => {
                     control={
                       <Checkbox
                         checked={selectedMetrics.diabetesProbability}
-                        onChange={() => handleMetricChange("diabetesProbability")}
+                        onChange={() =>
+                          handleMetricChange("diabetesProbability")
+                        }
                         sx={{
                           color: colors[2],
                           "&.Mui-checked": { color: colors[2] },
@@ -369,7 +377,11 @@ const HealthAnalytics = () => {
 
         <Card sx={cardWrapperSx}>
           <CardContent sx={chartCardContentSx}>
-            <Typography variant="h6" gutterBottom sx={{ fontWeight: 600, mb: 2 }}>
+            <Typography
+              variant="h6"
+              gutterBottom
+              sx={{ fontWeight: 600, mb: 2 }}
+            >
               Health Risk Trends Over Time
             </Typography>
             {chartSeries.length > 0 && healthData.length > 0 ? (
diff --git a/client/src/routes/Login.js b/client/src/routes/Login.js
index 9a34eb9e..76d63171 100644
--- a/client/src/routes/Login.js
+++ b/client/src/routes/Login.js
@@ -4,8 +4,10 @@ import Logo from "../assets/WellAiLogoTR.png";
 import WelcomePanel from "../components/WelcomePanel";
 
 /**
- * Introduces the services and provides forms for logging in to
- * the service.
+ * A page that introduces the service and provides the form for logging
+ * into the service.
+ *
+ * @returns {@mui.material.Box}
  */
 const Login = () => {
   return (
diff --git a/client/src/routes/MerchantGenerateReport.js b/client/src/routes/MerchantGenerateReport.js
index d080455e..5c3ef0ef 100644
--- a/client/src/routes/MerchantGenerateReport.js
+++ b/client/src/routes/MerchantGenerateReport.js
@@ -2,6 +2,12 @@ import { Container, ButtonGroup, Button, Box } from "@mui/material";
 import MerchantReportForm from "../components/MerchantReportForm";
 import { useState } from "react";
 
+/**
+ * A page that provides the health report form for merchants to generate
+ * reports for their patients.
+ *
+ * @returns {@mui.material.Container}
+ */
 const MerchantGenerateReport = ({}) => {
   const [page, setPage] = useState("manual");
 
diff --git a/client/src/routes/MerchantLanding.js b/client/src/routes/MerchantLanding.js
index c253a142..dc0b7763 100644
--- a/client/src/routes/MerchantLanding.js
+++ b/client/src/routes/MerchantLanding.js
@@ -4,6 +4,13 @@ import { useEffect, useState } from "react";
 
 const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
 
+/**
+ * A page that displays a collections of metrics that summarises the
+ * history and health data for all of a merchant's patients providing
+ * a quick overview.
+ *
+ * @returns {@mui.material.Container}
+ */
 const MerchantLanding = () => {
   const [data, setData] = useState({});
   const [name, setName] = useState("");
diff --git a/client/src/routes/MerchantReports.js b/client/src/routes/MerchantReports.js
index 5786f6fb..d09e2007 100644
--- a/client/src/routes/MerchantReports.js
+++ b/client/src/routes/MerchantReports.js
@@ -4,11 +4,9 @@ import CloseIcon from "@mui/icons-material/Close";
 import IconButton from "@mui/material/IconButton";
 import KeyboardArrowDownIcon from "@mui/icons-material/KeyboardArrowDown";
 import KeyboardArrowUpIcon from "@mui/icons-material/KeyboardArrowUp";
-
 import ConfirmationDialog from "../components/confirmationDialog";
 import React, { useState, useEffect } from "react";
 import { useLocation } from "react-router-dom";
-
 import {
   Box,
   Typography,
@@ -30,6 +28,12 @@ import {
 
 const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
 
+/**
+ * A page that provides the tools for a merchants to browse through their
+ * list of patients and view their past history reports.
+ *
+ * @returns {@mui.material.Box}
+ */
 const MerchantReports = ({}) => {
   const theme = useTheme();
   const isMobile = useMediaQuery(theme.breakpoints.down("sm"));
diff --git a/client/src/routes/PatientDetails.js b/client/src/routes/PatientDetails.js
index d56ca32d..ccd79a0d 100644
--- a/client/src/routes/PatientDetails.js
+++ b/client/src/routes/PatientDetails.js
@@ -1,4 +1,12 @@
-import { Box, Typography, Card, CardContent, Button, useTheme, useMediaQuery } from "@mui/material";
+import {
+  Box,
+  Typography,
+  Card,
+  CardContent,
+  Button,
+  useTheme,
+  useMediaQuery,
+} from "@mui/material";
 import { useState, useEffect } from "react";
 import { useNavigate, useParams } from "react-router-dom";
 import { BarChart } from "@mui/x-charts/BarChart";
@@ -8,7 +16,9 @@ const APPBAR_HEIGHT = { xs: "58px", sm: "66px" };
 const DRAWER_WIDTH = "65px";
 
 /**
- * A page used to display a individual patient information for a merchant user.
+ * A route used to display a individual patient information for a merchant user.
+ *
+ * @returns {@mui.materials.Box}
  */
 const PatientDetails = () => {
   const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
@@ -201,23 +211,33 @@ const PatientDetails = () => {
           >
             {["stroke", "diabetes", "cvd"].map((key) => (
               <Card key={key} sx={{ flex: 1, minWidth: 0 }}>
-                <CardContent 
-                  sx={{ 
-                    p: { xs: 1.5, sm: 2 }, 
+                <CardContent
+                  sx={{
+                    p: { xs: 1.5, sm: 2 },
                     "&:last-child": { pb: { xs: 1.5, sm: 2 } },
                     display: "flex",
                     flexDirection: "column",
                     alignItems: "center",
-                    textAlign: "center"
+                    textAlign: "center",
                   }}
                 >
                   <Typography
                     gutterBottom
-                    sx={{ color: "#747474", fontSize: { xs: "0.7rem", sm: "1.25rem" }, fontWeight: 500 }}
+                    sx={{
+                      color: "#747474",
+                      fontSize: { xs: "0.7rem", sm: "1.25rem" },
+                      fontWeight: 500,
+                    }}
                   >
                     {key.toUpperCase()}
                   </Typography>
-                  <Typography sx={{ fontSize: { xs: "1.4rem", sm: "2.125rem" }, fontWeight: 400, lineHeight: 1.2 }}>
+                  <Typography
+                    sx={{
+                      fontSize: { xs: "1.4rem", sm: "2.125rem" },
+                      fontWeight: 400,
+                      lineHeight: 1.2,
+                    }}
+                  >
                     {patientData?.risks?.[key]?.slice(-1)[0] ?? 0}%
                   </Typography>
                   <Box
diff --git a/client/src/routes/PatientManagement.js b/client/src/routes/PatientManagement.js
index 4901b93e..6dfe85c6 100644
--- a/client/src/routes/PatientManagement.js
+++ b/client/src/routes/PatientManagement.js
@@ -21,9 +21,10 @@ import VisibilityIcon from "@mui/icons-material/Visibility";
 import KeyboardArrowDownIcon from "@mui/icons-material/KeyboardArrowDown";
 import SearchIcon from "@mui/icons-material/Search";
 
-
 /**
  * A page used to display a list of all patients for a merchant user.
+ *
+ * @returns {@mui.material.Box}
  */
 const PatientManagement = () => {
   const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
@@ -214,7 +215,16 @@ const PatientManagement = () => {
             alignItems: { md: "center" },
           }}
         >
-          <Box sx={{ display: "flex", flexDirection: { xs: "column", sm: "row" }, gap: 1, flex: 1, mx: 1, py: 1 }}>
+          <Box
+            sx={{
+              display: "flex",
+              flexDirection: { xs: "column", sm: "row" },
+              gap: 1,
+              flex: 1,
+              mx: 1,
+              py: 1,
+            }}
+          >
             <TextField
               variant="standard"
               size="small"
@@ -232,10 +242,11 @@ const PatientManagement = () => {
               }}
             />
             <Divider
-            orientation="vertical"
-            flexItem sx={{
-              display: { xs: "none", md: "block" },
-              }} 
+              orientation="vertical"
+              flexItem
+              sx={{
+                display: { xs: "none", md: "block" },
+              }}
             />
             <Divider
               sx={{
@@ -261,10 +272,11 @@ const PatientManagement = () => {
           </Box>
 
           <Divider
-          orientation="vertical"
-          flexItem sx={{
-            display: { xs: "none", md: "block" },
-            }} 
+            orientation="vertical"
+            flexItem
+            sx={{
+              display: { xs: "none", md: "block" },
+            }}
           />
           <Divider
             sx={{
@@ -330,7 +342,7 @@ const PatientManagement = () => {
               paginationMode="server"
               onPaginationModelChange={setPaginationModel}
             />
-            </Box>
+          </Box>
         </Paper>
         <ConfirmationDialog
           open={deleteDialogOpen}
diff --git a/client/src/routes/Register.js b/client/src/routes/Register.js
index 18fe92df..9b397e6c 100644
--- a/client/src/routes/Register.js
+++ b/client/src/routes/Register.js
@@ -2,8 +2,9 @@ import { Container } from "@mui/material";
 import RegistrationForm from "../components/authentication/RegistrationForm";
 
 /**
- * A page used to display registration information and provide a form to allow
- * users to register.
+ * A page that displays the registration form.
+ *
+ * @returns {@mui.material.Container}
  */
 const Register = () => {
   return (
diff --git a/client/src/routes/ReportHistory.js b/client/src/routes/ReportHistory.js
index d50bbb00..1dc227ca 100644
--- a/client/src/routes/ReportHistory.js
+++ b/client/src/routes/ReportHistory.js
@@ -27,6 +27,11 @@ import {
 
 const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
 
+/**
+ * A page that provide the tools for a user to past health reports.
+ *
+ * @returns {@mui.material.Container}
+ */
 const AIHealthPrediction = ({}) => {
   const theme = useTheme();
   const isMobile = useMediaQuery(theme.breakpoints.down("sm"));
diff --git a/client/src/routes/RequestPatientAccess.js b/client/src/routes/RequestPatientAccess.js
index 38503025..2f7337ce 100644
--- a/client/src/routes/RequestPatientAccess.js
+++ b/client/src/routes/RequestPatientAccess.js
@@ -11,7 +11,9 @@ import ForgotPasswordForm from "../components/authentication/ForgotPasswordForm"
 import RequestPatientAccessForm from "../components/RequestPatientAccessForm";
 
 /**
- * Displays the form to request access to a patients record.
+ * A page that displays the form to request access to a patients record.
+ *
+ * @returns {@mui.material.Box}
  */
 const RequestPatientAccess = () => {
   return (
diff --git a/client/src/routes/ResetPassword.js b/client/src/routes/ResetPassword.js
index 61f3064b..af6eaf08 100644
--- a/client/src/routes/ResetPassword.js
+++ b/client/src/routes/ResetPassword.js
@@ -2,7 +2,10 @@ import { Container } from "@mui/material";
 import ResetPasswordForm from "../components/authentication/ResetPasswordForm";
 
 /**
- * Displays the form to reset a user's password if it has been forgotten.
+ * A page that displays the form to reset a user's password using a one-time
+ * password reset token.
+ *
+ * @return {@mui.material.Container}
  */
 const ResetPassword = () => {
   return (
diff --git a/client/src/routes/UserLanding.js b/client/src/routes/UserLanding.js
index 82c2ae87..2e7ab4c5 100644
--- a/client/src/routes/UserLanding.js
+++ b/client/src/routes/UserLanding.js
@@ -1,4 +1,12 @@
-import { Card, CardContent, Box, Divider, Typography, useTheme, useMediaQuery } from "@mui/material";
+import {
+  Card,
+  CardContent,
+  Box,
+  Divider,
+  Typography,
+  useTheme,
+  useMediaQuery,
+} from "@mui/material";
 import { useNavigate } from "react-router-dom";
 import { useEffect, useState } from "react";
 import { BarChart } from "@mui/x-charts/BarChart";
@@ -6,9 +14,13 @@ import { BarChart } from "@mui/x-charts/BarChart";
 // AppBar height: 56px toolbar + 2px border on mobile (xs), 64px + 2px on desktop (sm+)
 const APPBAR_HEIGHT = { xs: "58px", sm: "66px" };
 const DRAWER_WIDTH = "65px";
-
 const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
 
+/**
+ * A page that displays a collection of metrics based on the user's data.
+ *
+ * @returns {@mui.material.Box}
+ */
 const UserLanding = ({}) => {
   const navigate = useNavigate();
   const [name, setName] = useState(null);
diff --git a/client/src/routes/UserSettings.js b/client/src/routes/UserSettings.js
index 753b7655..47e54f05 100644
--- a/client/src/routes/UserSettings.js
+++ b/client/src/routes/UserSettings.js
@@ -22,6 +22,12 @@ import ConfirmationDialog from "../components/confirmationDialog";
 import { useNavigate } from "react-router-dom";
 import { UserContext } from "../utils/UserContext";
 
+/**
+ * A page that provides the tools for a user to securely update their
+ * account and personal details.
+ *
+ * @returns {@mui.material.Box}
+ */
 const UserSettings = () => {
   const navigate = useNavigate();
   const {
@@ -326,7 +332,10 @@ const UserSettings = () => {
             </Button>
           </Box>
           {deleteError && (
-            <Alert severity="error" sx={{ mt: 1, maxWidth: 500, textAlign: "left" }}>
+            <Alert
+              severity="error"
+              sx={{ mt: 1, maxWidth: 500, textAlign: "left" }}
+            >
               {deleteError}
             </Alert>
           )}
@@ -638,39 +647,37 @@ const UserSettings = () => {
             </Typography>
           </Box>
           <List component="nav" sx={{ p: 0 }}>
-            {["Account Details", "Profile", "Password"].map(
-              (item) => (
-                <ListItem
-                  key={item}
-                  button
-                  selected={selectedSection === item}
-                  onClick={() => setSelectedSection(item)}
-                  sx={{
-                    py: 2,
-                    px: 3,
-                    borderLeft:
-                      selectedSection === item
-                        ? "4px solid"
-                        : "4px solid transparent",
-                    borderLeftColor: "primary.main",
-                    bgcolor:
-                      selectedSection === item
-                        ? "action.selected"
-                        : "transparent",
-                    "&:hover": {
-                      bgcolor: "action.hover",
-                    },
+            {["Account Details", "Profile", "Password"].map((item) => (
+              <ListItem
+                key={item}
+                button
+                selected={selectedSection === item}
+                onClick={() => setSelectedSection(item)}
+                sx={{
+                  py: 2,
+                  px: 3,
+                  borderLeft:
+                    selectedSection === item
+                      ? "4px solid"
+                      : "4px solid transparent",
+                  borderLeftColor: "primary.main",
+                  bgcolor:
+                    selectedSection === item
+                      ? "action.selected"
+                      : "transparent",
+                  "&:hover": {
+                    bgcolor: "action.hover",
+                  },
+                }}
+              >
+                <ListItemText
+                  primary={item}
+                  primaryTypographyProps={{
+                    fontWeight: selectedSection === item ? 600 : 400,
                   }}
-                >
-                  <ListItemText
-                    primary={item}
-                    primaryTypographyProps={{
-                      fontWeight: selectedSection === item ? 600 : 400,
-                    }}
-                  />
-                </ListItem>
-              ),
-            )}
+                />
+              </ListItem>
+            ))}
           </List>
         </Box>
       )}
diff --git a/client/src/utils/LandingRoute.js b/client/src/utils/LandingRoute.js
index 47cc01dd..388e2b30 100644
--- a/client/src/utils/LandingRoute.js
+++ b/client/src/utils/LandingRoute.js
@@ -3,6 +3,11 @@ import { useEffect, useState } from "react";
 
 const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
 
+/**
+ * Reroutes a user to the landing page that corresponds to their role.
+ *
+ * @returns {react-router-dom.Navigate}
+ */
 const LandingRoute = () => {
   const [user, setUser] = useState(null);
   const [loading, setLoading] = useState(true);
diff --git a/client/src/utils/ProtectedRoutes.js b/client/src/utils/ProtectedRoutes.js
index 7dc84b3f..bf1ca4be 100644
--- a/client/src/utils/ProtectedRoutes.js
+++ b/client/src/utils/ProtectedRoutes.js
@@ -4,6 +4,15 @@ import NavBar from "../components/Navbar";
 
 const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
 
+/**
+ * Only grants access to components nested within to user's with the
+ * specified role. If the user is not logged when attempting to navigate to
+ * a protected route, they will be redirected once they log in.
+ *
+ * @param {Object} props
+ * @param {string} [props.role] - The role of a user
+ * @returns { empty | react-router-dom.Navigate}
+ */
 const ProtectedRoutes = ({ role }) => {
   const [user, setUser] = useState(null);
   const [loading, setLoading] = useState(true);
diff --git a/client/src/utils/PublicOnlyRoutes.js b/client/src/utils/PublicOnlyRoutes.js
index 9e505d7b..ef0b560d 100644
--- a/client/src/utils/PublicOnlyRoutes.js
+++ b/client/src/utils/PublicOnlyRoutes.js
@@ -4,7 +4,13 @@ import NavBar from "../components/Navbar";
 
 const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
 
-const PublicOnlyRoutes = ({ role }) => {
+/**
+ * Only grants access to child components when a user is not logged in
+ * the website.
+ *
+ * @returns {react-router-dom.Navigate | react-router-dom.Outlet}
+ */
+const PublicOnlyRoutes = () => {
   const [user, setUser] = useState(null);
   const [loading, setLoading] = useState(true);
 
diff --git a/client/src/utils/UserContext.js b/client/src/utils/UserContext.js
index 7d291519..13c738af 100644
--- a/client/src/utils/UserContext.js
+++ b/client/src/utils/UserContext.js
@@ -8,6 +8,13 @@ import {
 
 export const UserContext = createContext(null);
 
+/**
+ * A utility used to securely share information across the application.
+ *
+ * @param {Object} props
+ * @param {object} [props.children] - child elements nested in this element
+ * @returns {UserContext}
+ */
 export const UserProvider = ({ children }) => {
   const [user, setUser] = useState(null);
   const [loading, setLoading] = useState(true);

From 31c62222ffcbd27669f03527e27146aa50c5cbae Mon Sep 17 00:00:00 2001
From: Luke Bradley <bralc003@mymail.unisa.edu.au>
Date: Sat, 23 May 2026 12:11:28 +0930
Subject: [PATCH 049/105] Remove drawer from user report history page

---
 client/src/routes/ReportHistory.js | 157 ++++++++++++-----------------
 1 file changed, 67 insertions(+), 90 deletions(-)

diff --git a/client/src/routes/ReportHistory.js b/client/src/routes/ReportHistory.js
index 3c35a642..3234fe79 100644
--- a/client/src/routes/ReportHistory.js
+++ b/client/src/routes/ReportHistory.js
@@ -23,7 +23,9 @@ import {
   Drawer,
   useTheme,
   useMediaQuery,
+  Paper,
 } from "@mui/material";
+import { textAlign } from "@mui/system";
 
 const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
 
@@ -150,88 +152,79 @@ const AIHealthPrediction = ({}) => {
     return (
       <Box
         sx={{
-          display: "flex",
           minHeight: "100vh",
           bgcolor: "background.default",
           ml: "65px",
-          mt: "66px",
+          mt: "80px",
         }}
       >
-        <Drawer
-          anchor="top"
-          open={isOpen}
-          onClose={() => setIsOpen(false)}
-          variant="temporary"
-          PaperProps={{
-            sx: {
-              p: 2,
-              maxHeight: "50vh",
-            },
-          }}
-        >
+        <Paper variant="report-section">
+          <Box sx={{ p: 3, borderBottom: "1px solid #e0e0e0" }}>
+            <Typography
+              variant={isMobile ? "h4" : "h3"}
+              sx={{ textAlign: "center" }}
+            >
+              Report History
+            </Typography>
+          </Box>
+
+          {/* Date Select */}
           <Box
             sx={{
-              bgcolor: "background.paper",
-              borderRight: "1px solid #e0e0e0",
+              p: 2,
+              display: "flex",
+              gap: 2,
+              flexDirection: {
+                xs: "column",
+                md: "row",
+              },
             }}
           >
-            <Box sx={{ p: 3, borderBottom: "1px solid #e0e0e0" }}>
-              <Stack
-                direction="row"
-                alignItems="center"
-                justifyContent="space-between"
+            {/* Year */}
+            <FormControl fullWidth>
+              <InputLabel>Year</InputLabel>
+              <Select
+                value={selectedYear}
+                label="Year"
+                onChange={(e) => {
+                  setSelectedYear(e.target.value);
+                  setSelectedMonth(null);
+                }}
               >
-                <Typography variant={isMobile ? "h4" : "h3"}>
-                  Report History
-                </Typography>
-                <IconButton aria-label="menu" onClick={openBar}>
-                  <KeyboardArrowUpIcon fontSize="large" />
-                </IconButton>
-              </Stack>
-            </Box>
-
-            {/* Date Select */}
-            <Box sx={{ p: 2, display: "flex", gap: 2 }}>
-              {/* Year */}
-              <FormControl fullWidth>
-                <InputLabel>Year</InputLabel>
-                <Select
-                  value={selectedYear}
-                  label="Year"
-                  onChange={(e) => {
-                    setSelectedYear(e.target.value);
-                    setSelectedMonth(null);
-                  }}
-                >
-                  {years.map((year) => (
-                    <MenuItem key={year} value={year}>
-                      {year}
-                    </MenuItem>
-                  ))}
-                </Select>
-              </FormControl>
-
-              {/* Month */}
-              <FormControl fullWidth>
-                <InputLabel>Month</InputLabel>
-                <Select
-                  value={selectedMonth}
-                  label="Month"
-                  onChange={(e) => setSelectedMonth(e.target.value)}
-                >
-                  {months.map((month) => (
-                    <MenuItem key={month} value={month}>
-                      {new Date(0, month - 1).toLocaleString("en-AU", {
-                        month: "long",
-                      })}
-                    </MenuItem>
-                  ))}
-                </Select>
-              </FormControl>
+                {years.map((year) => (
+                  <MenuItem key={year} value={year}>
+                    {year}
+                  </MenuItem>
+                ))}
+              </Select>
+            </FormControl>
 
-              <Button onClick={handleClear}>Clear</Button>
-            </Box>
+            {/* Month */}
+            <FormControl fullWidth>
+              <InputLabel>Month</InputLabel>
+              <Select
+                value={selectedMonth}
+                label="Month"
+                onChange={(e) => setSelectedMonth(e.target.value)}
+              >
+                {months.map((month) => (
+                  <MenuItem key={month} value={month}>
+                    {new Date(0, month - 1).toLocaleString("en-AU", {
+                      month: "long",
+                    })}
+                  </MenuItem>
+                ))}
+              </Select>
+            </FormControl>
 
+            <Button onClick={handleClear}>Clear</Button>
+          </Box>
+          <Box
+            sx={{
+              maxHeight: 3 * 72,
+              overflowY: "auto",
+            }}
+          >
             <List component="nav" sx={{ p: 0 }}>
               {filteredReportDates.map((item) => (
                 <ListItem
@@ -266,11 +259,13 @@ const AIHealthPrediction = ({}) => {
                       >
                         {`Report: ${new Date(item.date).toLocaleDateString("en-AU")}`}
                         <Typography variant="subtle">
-                            {" "}{`${new Date(item.date).toLocaleTimeString("en-AU")}`}
+                          {" "}
+                          {`${new Date(item.date).toLocaleTimeString("en-AU")}`}
                         </Typography>
                       </Typography>
                     }
                   />
+
                   {/* Delete Report Button */}
                   {selectedDate.healthDataId === item.healthDataId && (
                     <IconButton
@@ -285,7 +280,7 @@ const AIHealthPrediction = ({}) => {
               ))}
             </List>
           </Box>
-        </Drawer>
+        </Paper>
 
         {/* Menu and Download Buttons */}
         <Box sx={{ flex: 1 }}>
@@ -298,24 +293,6 @@ const AIHealthPrediction = ({}) => {
               p: 2,
             }}
           >
-            <Box
-              sx={{
-                display: "flex",
-                alignItems: "center",
-                textAlign: "center",
-              }}
-            >
-              <Typography variant="h5" sx={{ ml: 2 }}>
-                View Report History
-              </Typography>
-
-              {!isOpen && (
-                <IconButton aria-label="menu" onClick={openBar}>
-                  <KeyboardArrowDownIcon fontSize="large" />
-                </IconButton>
-              )}
-            </Box>
-
             <Box sx={{ flexGrow: 1 }} />
             <DownloadReportButton
               healthDataId={selectedDate?.healthDataId}

From 4086c4736f1d258d6fb028cf7eeb55ef460efa17 Mon Sep 17 00:00:00 2001
From: Luke Bradley <bralc003@mymail.unisa.edu.au>
Date: Sat, 23 May 2026 12:24:14 +0930
Subject: [PATCH 050/105] Remove drawer from Merchant Reports page

---
 client/src/routes/MerchantReports.js | 194 ++++++++++++---------------
 client/src/routes/ReportHistory.js   |   2 +-
 2 files changed, 87 insertions(+), 109 deletions(-)

diff --git a/client/src/routes/MerchantReports.js b/client/src/routes/MerchantReports.js
index f5ee5b9d..316a4115 100644
--- a/client/src/routes/MerchantReports.js
+++ b/client/src/routes/MerchantReports.js
@@ -26,6 +26,7 @@ import {
   Stack,
   useTheme,
   useMediaQuery,
+  Paper,
 } from "@mui/material";
 
 const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
@@ -170,45 +171,26 @@ const MerchantReports = ({}) => {
   return (
     <Box
       sx={{
-        display: "flex",
         minHeight: "100vh",
         bgcolor: "background.default",
         ml: "65px",
-        mt: "66px",
+        mt: "80px",
       }}
     >
-      {/* Top Bar */}
-      <Drawer
-        anchor="top"
-        open={isOpen}
-        onClose={() => setIsOpen(false)}
-        variant="temporary"
-        PaperProps={{
-          sx: {
-            p: 2,
-            maxHeight: "50vh",
-          },
+      <Box
+        sx={{
+          bgcolor: "background.paper",
+          borderRight: "1px solid #e0e0e0",
         }}
       >
-        <Box
-          sx={{
-            bgcolor: "background.paper",
-            borderRight: "1px solid #e0e0e0",
-          }}
-        >
+        <Paper variant="report-section">
           <Box sx={{ p: 3, borderBottom: "1px solid #e0e0e0" }}>
-            <Stack
-              direction="row"
-              alignItems="center"
-              justifyContent="space-between"
+            <Typography
+              variant={isMobile ? "h4" : "h3"}
+              sx={{ textAlign: "center" }}
             >
-              <Typography variant={isMobile ? "h4" : "h3"}>
-                Report History
-              </Typography>
-              <IconButton aria-label="menu" onClick={openBar}>
-                <KeyboardArrowUpIcon fontSize="large" />
-              </IconButton>
-            </Stack>
+              Report History
+            </Typography>
           </Box>
           {/* Patient List */}
           <Box sx={{ p: 2 }}>
@@ -224,7 +206,17 @@ const MerchantReports = ({}) => {
             />
           </Box>
 
-          <Box sx={{ p: 2, display: "flex", gap: 2 }}>
+          <Box
+            sx={{
+              p: 2,
+              display: "flex",
+              gap: 2,
+              flexDirection: {
+                xs: "column",
+                md: "row",
+              },
+            }}
+          >
             {/* Year */}
             <FormControl fullWidth disabled={!selectedPatient}>
               <InputLabel>Year</InputLabel>
@@ -264,61 +256,69 @@ const MerchantReports = ({}) => {
 
             <Button onClick={handleClear}>Clear</Button>
           </Box>
-
-          <List component="nav" sx={{ p: 0 }}>
-            {filteredReportDates.map((item) => (
-              <ListItem
-                key={item.healthDataId}
-                selected={selectedDate?.healthDataId === item.healthDataId}
-                onClick={(e) => setSelectedDate(item)}
-                button
-                sx={{
-                  py: 2,
-                  px: 3,
-                  borderLeft:
-                    selectedDate?.healthDataId === item.healthDataId
-                      ? "4px solid"
-                      : "4px solid transparent",
-                  borderLeftColor: "primary.main",
-                  bgcolor:
-                    selectedDate?.healthDataId === item.healthDataId
-                      ? "action.selected"
-                      : "transparent",
-                }}
-              >
-                <ListItemText
-                  primary={
-                    <Typography
-                      variant="h7"
-                      sx={{
-                        fontWeight:
-                          selectedDate.healthDataId === item.healthDataId
-                            ? 400
-                            : 0,
-                      }}
-                    >
-                      {`Report: ${new Date(item.date).toLocaleDateString("en-AU")}`}
-                      <Typography variant="subtle">
-                          {" "}{`${new Date(item.date).toLocaleTimeString("en-AU")}`}
+          <Box
+            sx={{
+              maxHeight: 190,
+              overflowY: "auto",
+            }}
+          >
+            <List component="nav" sx={{ p: 0 }}>
+              {filteredReportDates.map((item) => (
+                <ListItem
+                  key={item.healthDataId}
+                  selected={selectedDate?.healthDataId === item.healthDataId}
+                  onClick={(e) => setSelectedDate(item)}
+                  button
+                  sx={{
+                    py: 2,
+                    px: 3,
+                    borderLeft:
+                      selectedDate?.healthDataId === item.healthDataId
+                        ? "4px solid"
+                        : "4px solid transparent",
+                    borderLeftColor: "primary.main",
+                    bgcolor:
+                      selectedDate?.healthDataId === item.healthDataId
+                        ? "action.selected"
+                        : "transparent",
+                  }}
+                >
+                  <ListItemText
+                    primary={
+                      <Typography
+                        variant="h7"
+                        sx={{
+                          fontWeight:
+                            selectedDate.healthDataId === item.healthDataId
+                              ? 400
+                              : 0,
+                        }}
+                      >
+                        {`Report: ${new Date(item.date).toLocaleDateString("en-AU")}`}
+                        <Typography variant="subtle">
+                          {" "}
+                          {`${new Date(item.date).toLocaleTimeString("en-AU")}`}
+                        </Typography>
                       </Typography>
-                    </Typography>
-                  }
-                />
-                {/* Delete Report Button */}
-                {selectedDate?.healthDataId === item.healthDataId && (
-                  <IconButton
-                    aria-label="delete"
-                    color="error"
-                    onClick={(e) => setDeleteDialogOpen(true)}
-                  >
-                    <CloseIcon />
-                  </IconButton>
-                )}
-              </ListItem>
-            ))}
-          </List>
-        </Box>
-      </Drawer>
+                    }
+                  />
+                  {/* Delete Report Button */}
+                  {selectedDate?.healthDataId === item.healthDataId && (
+                    <IconButton
+                      aria-label="delete"
+                      color="error"
+                      onClick={(e) => setDeleteDialogOpen(true)}
+                    >
+                      <CloseIcon />
+                    </IconButton>
+                  )}
+                </ListItem>
+              ))}
+            </List>
+          </Box>
+        </Paper>
+      </Box>
+
       {/* Report Content */}
 
       <Box sx={{ flex: 1 }}>
@@ -329,31 +329,9 @@ const MerchantReports = ({}) => {
             alignItems: { xs: "stretch", sm: "center" },
             gap: 2,
             p: 2,
+            justifyContent: "flex-end",
           }}
         >
-          <Box
-            sx={{
-              display: "flex",
-              alignItems: "center",
-              textAlign: "center",
-            }}
-          >
-            <Typography
-              variant="h5"
-              sx={{
-                color: "text.primary",
-              }}
-            >
-              View Patient Reports
-            </Typography>
-
-            {!isOpen && (
-              <IconButton aria-label="menu" onClick={openBar}>
-                <KeyboardArrowDownIcon fontSize="large" />
-              </IconButton>
-            )}
-          </Box>
-
           {selectedDate && reportData && (
             <DownloadReportButton
               healthDataId={selectedDate?.healthDataId}
diff --git a/client/src/routes/ReportHistory.js b/client/src/routes/ReportHistory.js
index 3234fe79..74309478 100644
--- a/client/src/routes/ReportHistory.js
+++ b/client/src/routes/ReportHistory.js
@@ -221,7 +221,7 @@ const AIHealthPrediction = ({}) => {
           </Box>
           <Box
             sx={{
-              maxHeight: 3 * 72,
+              maxHeight: 190,
               overflowY: "auto",
             }}
           >

From 0e7585470637c3784ecce61adf5007d9c1d30d96 Mon Sep 17 00:00:00 2001
From: Luke Bradley <bralc003@mymail.unisa.edu.au>
Date: Sat, 23 May 2026 12:44:31 +0930
Subject: [PATCH 051/105] Move merchant routes into a merchant route directory

---
 client/src/index.js                                | 14 +++++++-------
 client/src/routes/{ => merchant}/CreatePatient.js  |  2 +-
 .../{ => merchant}/MerchantGenerateReport.js       |  2 +-
 .../src/routes/{ => merchant}/MerchantLanding.js   |  0
 .../src/routes/{ => merchant}/MerchantReports.js   |  9 +++++----
 client/src/routes/{ => merchant}/PatientDetails.js |  0
 .../src/routes/{ => merchant}/PatientManagement.js |  2 +-
 .../routes/{ => merchant}/RequestPatientAccess.js  |  4 ++--
 8 files changed, 17 insertions(+), 16 deletions(-)
 rename client/src/routes/{ => merchant}/CreatePatient.js (90%)
 rename client/src/routes/{ => merchant}/MerchantGenerateReport.js (89%)
 rename client/src/routes/{ => merchant}/MerchantLanding.js (100%)
 rename client/src/routes/{ => merchant}/MerchantReports.js (97%)
 rename client/src/routes/{ => merchant}/PatientDetails.js (100%)
 rename client/src/routes/{ => merchant}/PatientManagement.js (99%)
 rename client/src/routes/{ => merchant}/RequestPatientAccess.js (81%)

diff --git a/client/src/index.js b/client/src/index.js
index b5fb0fd5..b3f88732 100644
--- a/client/src/index.js
+++ b/client/src/index.js
@@ -11,26 +11,26 @@ import Login from "./routes/Login";
 import Register from "./routes/Register";
 import UserLanding from "./routes/UserLanding";
 import UserSettings from "./routes/UserSettings";
-import MerchantGenerateReport from "./routes/MerchantGenerateReport";
+import MerchantGenerateReport from "./routes/merchant/MerchantGenerateReport";
 import AdministratorDashboard from "./routes/AdministratorDashboard";
 import AdministratorApproval from "./routes/AdministratorApproval";
 import AdministratorLogs from "./routes/AdministratorLogs";
 import AdministratorUsers from "./routes/AdministratorUsers";
-import MerchantLanding from "./routes/MerchantLanding";
-import MerchantReports from "./routes/MerchantReports";
+import MerchantLanding from "./routes/merchant/MerchantLanding";
+import MerchantReports from "./routes/merchant/MerchantReports";
 import AppThemeProvider from "./components/AppThemeProvider";
 import ProtectedRoutes from "./utils/ProtectedRoutes";
 import PublicOnlyRoutes from "./utils/PublicOnlyRoutes";
 import LandingRoute from "./utils/LandingRoute";
 import { UserProvider } from "./utils/UserContext";
 import ErrorPage from "./routes/ErrorPage";
-import PatientManagement from "./routes/PatientManagement";
-import PatientDetails from "./routes/PatientDetails";
-import CreatePatient from "./routes/CreatePatient";
+import PatientManagement from "./routes/merchant/PatientManagement";
+import PatientDetails from "./routes/merchant/PatientDetails";
+import CreatePatient from "./routes/merchant/CreatePatient";
 import ForgotPassword from "./routes/ForgotPassword";
 import ResetPassword from "./routes/ResetPassword";
 import AcceptAccessRequest from "./routes/AcceptAccessRequest";
-import RequestPatientAccess from "./routes/RequestPatientAccess";
+import RequestPatientAccess from "./routes/merchant/RequestPatientAccess";
 
 const root = ReactDOM.createRoot(document.getElementById("root"));
 root.render(
diff --git a/client/src/routes/CreatePatient.js b/client/src/routes/merchant/CreatePatient.js
similarity index 90%
rename from client/src/routes/CreatePatient.js
rename to client/src/routes/merchant/CreatePatient.js
index 8735ea67..863ea59f 100644
--- a/client/src/routes/CreatePatient.js
+++ b/client/src/routes/merchant/CreatePatient.js
@@ -1,5 +1,5 @@
 import { Box } from "@mui/material";
-import CreatePatientForm from "../components/authentication/CreatePatientForm";
+import CreatePatientForm from "../../components/authentication/CreatePatientForm";
 
 // AppBar height: 56px toolbar + 2px border on mobile (xs), 64px + 2px on desktop (sm+)
 const APPBAR_HEIGHT = { xs: "58px", sm: "66px" };
diff --git a/client/src/routes/MerchantGenerateReport.js b/client/src/routes/merchant/MerchantGenerateReport.js
similarity index 89%
rename from client/src/routes/MerchantGenerateReport.js
rename to client/src/routes/merchant/MerchantGenerateReport.js
index 5c3ef0ef..7fc80438 100644
--- a/client/src/routes/MerchantGenerateReport.js
+++ b/client/src/routes/merchant/MerchantGenerateReport.js
@@ -1,5 +1,5 @@
 import { Container, ButtonGroup, Button, Box } from "@mui/material";
-import MerchantReportForm from "../components/MerchantReportForm";
+import MerchantReportForm from "../../components/MerchantReportForm";
 import { useState } from "react";
 
 /**
diff --git a/client/src/routes/MerchantLanding.js b/client/src/routes/merchant/MerchantLanding.js
similarity index 100%
rename from client/src/routes/MerchantLanding.js
rename to client/src/routes/merchant/MerchantLanding.js
diff --git a/client/src/routes/MerchantReports.js b/client/src/routes/merchant/MerchantReports.js
similarity index 97%
rename from client/src/routes/MerchantReports.js
rename to client/src/routes/merchant/MerchantReports.js
index 39323b87..075c712e 100644
--- a/client/src/routes/MerchantReports.js
+++ b/client/src/routes/merchant/MerchantReports.js
@@ -1,10 +1,10 @@
-import ReportTemplate from "../components/ReportTemplate";
-import DownloadReportButton from "../components/DownloadReportButton";
+import ReportTemplate from "../../components/ReportTemplate";
+import DownloadReportButton from "../../components/DownloadReportButton";
 import CloseIcon from "@mui/icons-material/Close";
 import IconButton from "@mui/material/IconButton";
 import KeyboardArrowDownIcon from "@mui/icons-material/KeyboardArrowDown";
 import KeyboardArrowUpIcon from "@mui/icons-material/KeyboardArrowUp";
-import ConfirmationDialog from "../components/confirmationDialog";
+import ConfirmationDialog from "../../components/confirmationDialog";
 import React, { useState, useEffect } from "react";
 import { useLocation } from "react-router-dom";
 import {
@@ -303,7 +303,8 @@ const MerchantReports = ({}) => {
                     >
                       {`Report: ${new Date(item.date).toLocaleDateString("en-AU")}`}
                       <Typography variant="subtle">
-                          {" "}{`${new Date(item.date).toLocaleTimeString("en-AU")}`}
+                        {" "}
+                        {`${new Date(item.date).toLocaleTimeString("en-AU")}`}
                       </Typography>
                     </Typography>
                   }
diff --git a/client/src/routes/PatientDetails.js b/client/src/routes/merchant/PatientDetails.js
similarity index 100%
rename from client/src/routes/PatientDetails.js
rename to client/src/routes/merchant/PatientDetails.js
diff --git a/client/src/routes/PatientManagement.js b/client/src/routes/merchant/PatientManagement.js
similarity index 99%
rename from client/src/routes/PatientManagement.js
rename to client/src/routes/merchant/PatientManagement.js
index 6dfe85c6..565e9175 100644
--- a/client/src/routes/PatientManagement.js
+++ b/client/src/routes/merchant/PatientManagement.js
@@ -1,6 +1,6 @@
 import { useState, useEffect } from "react";
 import { useNavigate } from "react-router-dom";
-import ConfirmationDialog from "../components/confirmationDialog";
+import ConfirmationDialog from "../../components/confirmationDialog";
 import InputAdornment from "@mui/material/InputAdornment";
 import {
   Box,
diff --git a/client/src/routes/RequestPatientAccess.js b/client/src/routes/merchant/RequestPatientAccess.js
similarity index 81%
rename from client/src/routes/RequestPatientAccess.js
rename to client/src/routes/merchant/RequestPatientAccess.js
index 2f7337ce..16afe84f 100644
--- a/client/src/routes/RequestPatientAccess.js
+++ b/client/src/routes/merchant/RequestPatientAccess.js
@@ -7,8 +7,8 @@ import {
   Link,
   Divider,
 } from "@mui/material";
-import ForgotPasswordForm from "../components/authentication/ForgotPasswordForm";
-import RequestPatientAccessForm from "../components/RequestPatientAccessForm";
+import ForgotPasswordForm from "../../components/authentication/ForgotPasswordForm";
+import RequestPatientAccessForm from "../../components/RequestPatientAccessForm";
 
 /**
  * A page that displays the form to request access to a patients record.

From 1fb82b7437436555521450430e36233119601912 Mon Sep 17 00:00:00 2001
From: Luke Bradley <bralc003@mymail.unisa.edu.au>
Date: Sat, 23 May 2026 12:52:26 +0930
Subject: [PATCH 052/105] Move standard user pages into a starndardUser route
 dir

---
 client/src/index.js                                  | 12 ++++++------
 .../routes/{ => standardUser}/AcceptAccessRequest.js |  2 +-
 .../src/routes/{ => standardUser}/GenerateReport.js  |  2 +-
 .../src/routes/{ => standardUser}/HealthAnalytics.js |  0
 .../src/routes/{ => standardUser}/ReportHistory.js   |  9 +++++----
 client/src/routes/{ => standardUser}/UserLanding.js  |  0
 client/src/routes/{ => standardUser}/UserSettings.js |  6 +++---
 7 files changed, 16 insertions(+), 15 deletions(-)
 rename client/src/routes/{ => standardUser}/AcceptAccessRequest.js (91%)
 rename client/src/routes/{ => standardUser}/GenerateReport.js (86%)
 rename client/src/routes/{ => standardUser}/HealthAnalytics.js (100%)
 rename client/src/routes/{ => standardUser}/ReportHistory.js (97%)
 rename client/src/routes/{ => standardUser}/UserLanding.js (100%)
 rename client/src/routes/{ => standardUser}/UserSettings.js (99%)

diff --git a/client/src/index.js b/client/src/index.js
index b3f88732..7f6db99c 100644
--- a/client/src/index.js
+++ b/client/src/index.js
@@ -4,13 +4,13 @@ import "./index.css";
 import App from "./App";
 import reportWebVitals from "./reportWebVitals";
 import { BrowserRouter, Routes, Route } from "react-router-dom";
-import ReportHistory from "./routes/ReportHistory";
-import GenerateReport from "./routes/GenerateReport";
-import HealthAnalytics from "./routes/HealthAnalytics";
+import ReportHistory from "./routes/standardUser/ReportHistory";
+import GenerateReport from "./routes/standardUser/GenerateReport";
+import HealthAnalytics from "./routes/standardUser/HealthAnalytics";
 import Login from "./routes/Login";
 import Register from "./routes/Register";
-import UserLanding from "./routes/UserLanding";
-import UserSettings from "./routes/UserSettings";
+import UserLanding from "./routes/standardUser/UserLanding";
+import UserSettings from "./routes/standardUser/UserSettings";
 import MerchantGenerateReport from "./routes/merchant/MerchantGenerateReport";
 import AdministratorDashboard from "./routes/AdministratorDashboard";
 import AdministratorApproval from "./routes/AdministratorApproval";
@@ -29,7 +29,7 @@ import PatientDetails from "./routes/merchant/PatientDetails";
 import CreatePatient from "./routes/merchant/CreatePatient";
 import ForgotPassword from "./routes/ForgotPassword";
 import ResetPassword from "./routes/ResetPassword";
-import AcceptAccessRequest from "./routes/AcceptAccessRequest";
+import AcceptAccessRequest from "./routes/standardUser/AcceptAccessRequest";
 import RequestPatientAccess from "./routes/merchant/RequestPatientAccess";
 
 const root = ReactDOM.createRoot(document.getElementById("root"));
diff --git a/client/src/routes/AcceptAccessRequest.js b/client/src/routes/standardUser/AcceptAccessRequest.js
similarity index 91%
rename from client/src/routes/AcceptAccessRequest.js
rename to client/src/routes/standardUser/AcceptAccessRequest.js
index 388ea533..c1b670e4 100644
--- a/client/src/routes/AcceptAccessRequest.js
+++ b/client/src/routes/standardUser/AcceptAccessRequest.js
@@ -7,7 +7,7 @@ import {
   Link,
   Divider,
 } from "@mui/material";
-import AcceptRequestForm from "../components/AcceptRequestForm";
+import AcceptRequestForm from "../../components/AcceptRequestForm";
 
 /**
  * A page that displays the accept access request form for users to
diff --git a/client/src/routes/GenerateReport.js b/client/src/routes/standardUser/GenerateReport.js
similarity index 86%
rename from client/src/routes/GenerateReport.js
rename to client/src/routes/standardUser/GenerateReport.js
index 63c32a5a..1f4d1b01 100644
--- a/client/src/routes/GenerateReport.js
+++ b/client/src/routes/standardUser/GenerateReport.js
@@ -1,4 +1,4 @@
-import GenerateReportForm from "../components/GenerateReportForm";
+import GenerateReportForm from "../../components/GenerateReportForm";
 import { Box } from "@mui/material";
 
 /**
diff --git a/client/src/routes/HealthAnalytics.js b/client/src/routes/standardUser/HealthAnalytics.js
similarity index 100%
rename from client/src/routes/HealthAnalytics.js
rename to client/src/routes/standardUser/HealthAnalytics.js
diff --git a/client/src/routes/ReportHistory.js b/client/src/routes/standardUser/ReportHistory.js
similarity index 97%
rename from client/src/routes/ReportHistory.js
rename to client/src/routes/standardUser/ReportHistory.js
index c67ceeb0..738ce1b3 100644
--- a/client/src/routes/ReportHistory.js
+++ b/client/src/routes/standardUser/ReportHistory.js
@@ -1,9 +1,9 @@
-import ReportTemplate from "../components/ReportTemplate";
-import DownloadReportButton from "../components/DownloadReportButton";
+import ReportTemplate from "../../components/ReportTemplate";
+import DownloadReportButton from "../../components/DownloadReportButton";
 import CloseIcon from "@mui/icons-material/Close";
 import IconButton from "@mui/material/IconButton";
 import MenuIcon from "@mui/icons-material/Menu";
-import ConfirmationDialog from "../components/confirmationDialog";
+import ConfirmationDialog from "../../components/confirmationDialog";
 import Stack from "@mui/material/Stack";
 import React, { useState, useEffect } from "react";
 import KeyboardArrowDownIcon from "@mui/icons-material/KeyboardArrowDown";
@@ -271,7 +271,8 @@ const AIHealthPrediction = ({}) => {
                       >
                         {`Report: ${new Date(item.date).toLocaleDateString("en-AU")}`}
                         <Typography variant="subtle">
-                            {" "}{`${new Date(item.date).toLocaleTimeString("en-AU")}`}
+                          {" "}
+                          {`${new Date(item.date).toLocaleTimeString("en-AU")}`}
                         </Typography>
                       </Typography>
                     }
diff --git a/client/src/routes/UserLanding.js b/client/src/routes/standardUser/UserLanding.js
similarity index 100%
rename from client/src/routes/UserLanding.js
rename to client/src/routes/standardUser/UserLanding.js
diff --git a/client/src/routes/UserSettings.js b/client/src/routes/standardUser/UserSettings.js
similarity index 99%
rename from client/src/routes/UserSettings.js
rename to client/src/routes/standardUser/UserSettings.js
index e3c4694e..93de7862 100644
--- a/client/src/routes/UserSettings.js
+++ b/client/src/routes/standardUser/UserSettings.js
@@ -18,10 +18,10 @@ import {
   Tabs,
   Tab,
 } from "@mui/material";
-import ConfirmationDialog from "../components/confirmationDialog";
+import ConfirmationDialog from "../../components/confirmationDialog";
 import { useNavigate } from "react-router-dom";
-import { UserContext } from "../utils/UserContext";
-import PhoneInputField from "../components/authentication/PhoneInputField";
+import { UserContext } from "../../utils/UserContext";
+import PhoneInputField from "../../components/authentication/PhoneInputField";
 
 /**
  * A page that provides the tools for a user to securely update their

From 1bb01b5f6b78d873210333369c167eb5a9b846f4 Mon Sep 17 00:00:00 2001
From: Luke Bradley <bralc003@mymail.unisa.edu.au>
Date: Sat, 23 May 2026 12:56:24 +0930
Subject: [PATCH 053/105] Move admin routes into a admin route directory

---
 client/src/index.js                              |  8 ++++----
 .../routes/{ => admin}/AdministratorApproval.js  |  2 +-
 .../routes/{ => admin}/AdministratorDashboard.js | 16 ++++++++--------
 .../src/routes/{ => admin}/AdministratorLogs.js  |  2 +-
 .../src/routes/{ => admin}/AdministratorUsers.js |  2 +-
 5 files changed, 15 insertions(+), 15 deletions(-)
 rename client/src/routes/{ => admin}/AdministratorApproval.js (93%)
 rename client/src/routes/{ => admin}/AdministratorDashboard.js (79%)
 rename client/src/routes/{ => admin}/AdministratorLogs.js (93%)
 rename client/src/routes/{ => admin}/AdministratorUsers.js (93%)

diff --git a/client/src/index.js b/client/src/index.js
index 7f6db99c..e73e71df 100644
--- a/client/src/index.js
+++ b/client/src/index.js
@@ -12,10 +12,10 @@ import Register from "./routes/Register";
 import UserLanding from "./routes/standardUser/UserLanding";
 import UserSettings from "./routes/standardUser/UserSettings";
 import MerchantGenerateReport from "./routes/merchant/MerchantGenerateReport";
-import AdministratorDashboard from "./routes/AdministratorDashboard";
-import AdministratorApproval from "./routes/AdministratorApproval";
-import AdministratorLogs from "./routes/AdministratorLogs";
-import AdministratorUsers from "./routes/AdministratorUsers";
+import AdministratorDashboard from "./routes/admin/AdministratorDashboard";
+import AdministratorApproval from "./routes/admin/AdministratorApproval";
+import AdministratorLogs from "./routes/admin/AdministratorLogs";
+import AdministratorUsers from "./routes/admin/AdministratorUsers";
 import MerchantLanding from "./routes/merchant/MerchantLanding";
 import MerchantReports from "./routes/merchant/MerchantReports";
 import AppThemeProvider from "./components/AppThemeProvider";
diff --git a/client/src/routes/AdministratorApproval.js b/client/src/routes/admin/AdministratorApproval.js
similarity index 93%
rename from client/src/routes/AdministratorApproval.js
rename to client/src/routes/admin/AdministratorApproval.js
index d1221ee5..e7bf8030 100644
--- a/client/src/routes/AdministratorApproval.js
+++ b/client/src/routes/admin/AdministratorApproval.js
@@ -1,4 +1,4 @@
-import AccountApprovalTable from "../components/administrator/AccountApprovalTable";
+import AccountApprovalTable from "../../components/administrator/AccountApprovalTable";
 import { Box, Typography, Divider, Stack, Container } from "@mui/material";
 
 /**
diff --git a/client/src/routes/AdministratorDashboard.js b/client/src/routes/admin/AdministratorDashboard.js
similarity index 79%
rename from client/src/routes/AdministratorDashboard.js
rename to client/src/routes/admin/AdministratorDashboard.js
index 1514c5c2..c2e1c8e4 100644
--- a/client/src/routes/AdministratorDashboard.js
+++ b/client/src/routes/admin/AdministratorDashboard.js
@@ -10,14 +10,14 @@ import {
 } from "@mui/material";
 import { BarChart } from "@mui/x-charts/BarChart";
 import { useEffect, useState } from "react";
-import ActiveMerchantsAnalytics from "../components/administrator/analytics/ActiveMerchantsAnalytics";
-import ActiveUsersAnalytics from "../components/administrator/analytics/ActiveUsersAnalytics";
-import AverageRiskSeriesAnalytics from "../components/administrator/analytics/AverageRiskSeriesAnalytics";
-import LoginActivityAnalytics from "../components/administrator/analytics/LoginActivityAnalytics";
-import PendingMerchantsAnalytics from "../components/administrator/analytics/PendingMerchantsAnalytics";
-import RecentReportsGeneratedAnalytics from "../components/administrator/analytics/RecentReportsGeneratedAnalytics";
-import UnvalidatedAccountAnalytics from "../components/administrator/analytics/UnvalidatedAccountAnalytics";
-import UserAccountAnalytics from "../components/administrator/analytics/UserAccountAnalytics";
+import ActiveMerchantsAnalytics from "../../components/administrator/analytics/ActiveMerchantsAnalytics";
+import ActiveUsersAnalytics from "../../components/administrator/analytics/ActiveUsersAnalytics";
+import AverageRiskSeriesAnalytics from "../../components/administrator/analytics/AverageRiskSeriesAnalytics";
+import LoginActivityAnalytics from "../../components/administrator/analytics/LoginActivityAnalytics";
+import PendingMerchantsAnalytics from "../../components/administrator/analytics/PendingMerchantsAnalytics";
+import RecentReportsGeneratedAnalytics from "../../components/administrator/analytics/RecentReportsGeneratedAnalytics";
+import UnvalidatedAccountAnalytics from "../../components/administrator/analytics/UnvalidatedAccountAnalytics";
+import UserAccountAnalytics from "../../components/administrator/analytics/UserAccountAnalytics";
 
 const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
 
diff --git a/client/src/routes/AdministratorLogs.js b/client/src/routes/admin/AdministratorLogs.js
similarity index 93%
rename from client/src/routes/AdministratorLogs.js
rename to client/src/routes/admin/AdministratorLogs.js
index 15311038..2a58ecc7 100644
--- a/client/src/routes/AdministratorLogs.js
+++ b/client/src/routes/admin/AdministratorLogs.js
@@ -1,4 +1,4 @@
-import AuditLogTable from "../components/administrator/AuditLogTable";
+import AuditLogTable from "../../components/administrator/AuditLogTable";
 import { Box, Typography, Divider, Stack, Container } from "@mui/material";
 import AdministratorApproval from "./AdministratorApproval";
 
diff --git a/client/src/routes/AdministratorUsers.js b/client/src/routes/admin/AdministratorUsers.js
similarity index 93%
rename from client/src/routes/AdministratorUsers.js
rename to client/src/routes/admin/AdministratorUsers.js
index f2993c17..45e469e9 100644
--- a/client/src/routes/AdministratorUsers.js
+++ b/client/src/routes/admin/AdministratorUsers.js
@@ -1,4 +1,4 @@
-import UserManagementTable from "../components/administrator/UserManagementTable";
+import UserManagementTable from "../../components/administrator/UserManagementTable";
 import { Box, Typography, Divider, Stack, Container } from "@mui/material";
 
 /**

From c74121c526b01b07cdca54b8a47b2b20b085079c Mon Sep 17 00:00:00 2001
From: Luke Bradley <bralc003@mymail.unisa.edu.au>
Date: Sat, 23 May 2026 12:59:25 +0930
Subject: [PATCH 054/105] Move publicly accessed routes to a public routes
 directory

---
 client/src/index.js                              | 10 +++++-----
 client/src/routes/{ => public}/ErrorPage.js      |  2 +-
 client/src/routes/{ => public}/ForgotPassword.js |  2 +-
 client/src/routes/{ => public}/Login.js          |  6 +++---
 client/src/routes/{ => public}/Register.js       |  2 +-
 client/src/routes/{ => public}/ResetPassword.js  |  2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)
 rename client/src/routes/{ => public}/ErrorPage.js (95%)
 rename client/src/routes/{ => public}/ForgotPassword.js (89%)
 rename client/src/routes/{ => public}/Login.js (83%)
 rename client/src/routes/{ => public}/Register.js (87%)
 rename client/src/routes/{ => public}/ResetPassword.js (88%)

diff --git a/client/src/index.js b/client/src/index.js
index e73e71df..8412d7c0 100644
--- a/client/src/index.js
+++ b/client/src/index.js
@@ -7,8 +7,8 @@ import { BrowserRouter, Routes, Route } from "react-router-dom";
 import ReportHistory from "./routes/standardUser/ReportHistory";
 import GenerateReport from "./routes/standardUser/GenerateReport";
 import HealthAnalytics from "./routes/standardUser/HealthAnalytics";
-import Login from "./routes/Login";
-import Register from "./routes/Register";
+import Login from "./routes/public/Login";
+import Register from "./routes/public/Register";
 import UserLanding from "./routes/standardUser/UserLanding";
 import UserSettings from "./routes/standardUser/UserSettings";
 import MerchantGenerateReport from "./routes/merchant/MerchantGenerateReport";
@@ -23,12 +23,12 @@ import ProtectedRoutes from "./utils/ProtectedRoutes";
 import PublicOnlyRoutes from "./utils/PublicOnlyRoutes";
 import LandingRoute from "./utils/LandingRoute";
 import { UserProvider } from "./utils/UserContext";
-import ErrorPage from "./routes/ErrorPage";
+import ErrorPage from "./routes/public/ErrorPage";
 import PatientManagement from "./routes/merchant/PatientManagement";
 import PatientDetails from "./routes/merchant/PatientDetails";
 import CreatePatient from "./routes/merchant/CreatePatient";
-import ForgotPassword from "./routes/ForgotPassword";
-import ResetPassword from "./routes/ResetPassword";
+import ForgotPassword from "./routes/public/ForgotPassword";
+import ResetPassword from "./routes/public/ResetPassword";
 import AcceptAccessRequest from "./routes/standardUser/AcceptAccessRequest";
 import RequestPatientAccess from "./routes/merchant/RequestPatientAccess";
 
diff --git a/client/src/routes/ErrorPage.js b/client/src/routes/public/ErrorPage.js
similarity index 95%
rename from client/src/routes/ErrorPage.js
rename to client/src/routes/public/ErrorPage.js
index cd04b2ab..c4ca9e26 100644
--- a/client/src/routes/ErrorPage.js
+++ b/client/src/routes/public/ErrorPage.js
@@ -1,6 +1,6 @@
 import { Typography, Button, Box, Stack } from "@mui/material";
 import { useNavigate } from "react-router-dom";
-import Logo from "../assets/WellAiLogoTR.png";
+import Logo from "../../assets/WellAiLogoTR.png";
 
 /**
  * A page that is displayed when a user tried to navigate a non-existent
diff --git a/client/src/routes/ForgotPassword.js b/client/src/routes/public/ForgotPassword.js
similarity index 89%
rename from client/src/routes/ForgotPassword.js
rename to client/src/routes/public/ForgotPassword.js
index 2fcd8744..34d95202 100644
--- a/client/src/routes/ForgotPassword.js
+++ b/client/src/routes/public/ForgotPassword.js
@@ -1,5 +1,5 @@
 import { Box, Container } from "@mui/material";
-import ForgotPasswordForm from "../components/authentication/ForgotPasswordForm";
+import ForgotPasswordForm from "../../components/authentication/ForgotPasswordForm";
 
 /**
  * A route that provides the form for a user to reset their password by initiating
diff --git a/client/src/routes/Login.js b/client/src/routes/public/Login.js
similarity index 83%
rename from client/src/routes/Login.js
rename to client/src/routes/public/Login.js
index 76d63171..bde537d5 100644
--- a/client/src/routes/Login.js
+++ b/client/src/routes/public/Login.js
@@ -1,7 +1,7 @@
 import { Box, Container, Stack, Typography } from "@mui/material";
-import LoginForm from "../components/authentication/LoginForm";
-import Logo from "../assets/WellAiLogoTR.png";
-import WelcomePanel from "../components/WelcomePanel";
+import LoginForm from "../../components/authentication/LoginForm";
+import Logo from "../../assets/WellAiLogoTR.png";
+import WelcomePanel from "../../components/WelcomePanel";
 
 /**
  * A page that introduces the service and provides the form for logging
diff --git a/client/src/routes/Register.js b/client/src/routes/public/Register.js
similarity index 87%
rename from client/src/routes/Register.js
rename to client/src/routes/public/Register.js
index 9b397e6c..a10f8237 100644
--- a/client/src/routes/Register.js
+++ b/client/src/routes/public/Register.js
@@ -1,5 +1,5 @@
 import { Container } from "@mui/material";
-import RegistrationForm from "../components/authentication/RegistrationForm";
+import RegistrationForm from "../../components/authentication/RegistrationForm";
 
 /**
  * A page that displays the registration form.
diff --git a/client/src/routes/ResetPassword.js b/client/src/routes/public/ResetPassword.js
similarity index 88%
rename from client/src/routes/ResetPassword.js
rename to client/src/routes/public/ResetPassword.js
index af6eaf08..c61123e8 100644
--- a/client/src/routes/ResetPassword.js
+++ b/client/src/routes/public/ResetPassword.js
@@ -1,5 +1,5 @@
 import { Container } from "@mui/material";
-import ResetPasswordForm from "../components/authentication/ResetPasswordForm";
+import ResetPasswordForm from "../../components/authentication/ResetPasswordForm";
 
 /**
  * A page that displays the form to reset a user's password using a one-time

From 8081219301d00e6cc16003bfcdf048a0d1e63d22 Mon Sep 17 00:00:00 2001
From: Luke Bradley <bralc003@mymail.unisa.edu.au>
Date: Sat, 23 May 2026 13:10:21 +0930
Subject: [PATCH 055/105] Add comments to differentiate routes in index.js

---
 client/src/index.js | 38 ++++++++++++++++++++++++--------------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/client/src/index.js b/client/src/index.js
index 8412d7c0..f3f78875 100644
--- a/client/src/index.js
+++ b/client/src/index.js
@@ -4,33 +4,43 @@ import "./index.css";
 import App from "./App";
 import reportWebVitals from "./reportWebVitals";
 import { BrowserRouter, Routes, Route } from "react-router-dom";
-import ReportHistory from "./routes/standardUser/ReportHistory";
-import GenerateReport from "./routes/standardUser/GenerateReport";
-import HealthAnalytics from "./routes/standardUser/HealthAnalytics";
+
+// Public routes
 import Login from "./routes/public/Login";
 import Register from "./routes/public/Register";
+import ForgotPassword from "./routes/public/ForgotPassword";
+import ResetPassword from "./routes/public/ResetPassword";
+import ErrorPage from "./routes/public/ErrorPage";
+
+// Standard user routes
 import UserLanding from "./routes/standardUser/UserLanding";
+import ReportHistory from "./routes/standardUser/ReportHistory";
+import GenerateReport from "./routes/standardUser/GenerateReport";
+import HealthAnalytics from "./routes/standardUser/HealthAnalytics";
 import UserSettings from "./routes/standardUser/UserSettings";
+import AcceptAccessRequest from "./routes/standardUser/AcceptAccessRequest";
+
+// Merchant routes
+import MerchantLanding from "./routes/merchant/MerchantLanding";
+import MerchantReports from "./routes/merchant/MerchantReports";
 import MerchantGenerateReport from "./routes/merchant/MerchantGenerateReport";
+import PatientManagement from "./routes/merchant/PatientManagement";
+import PatientDetails from "./routes/merchant/PatientDetails";
+import CreatePatient from "./routes/merchant/CreatePatient";
+import RequestPatientAccess from "./routes/merchant/RequestPatientAccess";
+
+// Admin routes
 import AdministratorDashboard from "./routes/admin/AdministratorDashboard";
 import AdministratorApproval from "./routes/admin/AdministratorApproval";
 import AdministratorLogs from "./routes/admin/AdministratorLogs";
 import AdministratorUsers from "./routes/admin/AdministratorUsers";
-import MerchantLanding from "./routes/merchant/MerchantLanding";
-import MerchantReports from "./routes/merchant/MerchantReports";
+
+// Utils
 import AppThemeProvider from "./components/AppThemeProvider";
+import { UserProvider } from "./utils/UserContext";
 import ProtectedRoutes from "./utils/ProtectedRoutes";
 import PublicOnlyRoutes from "./utils/PublicOnlyRoutes";
 import LandingRoute from "./utils/LandingRoute";
-import { UserProvider } from "./utils/UserContext";
-import ErrorPage from "./routes/public/ErrorPage";
-import PatientManagement from "./routes/merchant/PatientManagement";
-import PatientDetails from "./routes/merchant/PatientDetails";
-import CreatePatient from "./routes/merchant/CreatePatient";
-import ForgotPassword from "./routes/public/ForgotPassword";
-import ResetPassword from "./routes/public/ResetPassword";
-import AcceptAccessRequest from "./routes/standardUser/AcceptAccessRequest";
-import RequestPatientAccess from "./routes/merchant/RequestPatientAccess";
 
 const root = ReactDOM.createRoot(document.getElementById("root"));
 root.render(

From 64c6cfed62afc7ca2afbbe92886293d9623fb6b9 Mon Sep 17 00:00:00 2001
From: Luke Bradley <bralc003@mymail.unisa.edu.au>
Date: Sat, 23 May 2026 13:22:11 +0930
Subject: [PATCH 056/105] Move health report component files into a grouped
 folder

---
 client/src/components/{ => healthReport}/BloodReportUpload.js | 0
 .../src/components/{ => healthReport}/DownloadReportButton.js | 0
 .../src/components/{ => healthReport}/GenerateReportForm.js   | 0
 .../src/components/{ => healthReport}/HealthReportPDFFlat.js  | 2 +-
 .../src/components/{ => healthReport}/MerchantReportForm.js   | 0
 client/src/components/{ => healthReport}/ReportTemplate.js    | 0
 client/src/routes/merchant/MerchantGenerateReport.js          | 2 +-
 client/src/routes/merchant/MerchantReports.js                 | 4 ++--
 client/src/routes/standardUser/GenerateReport.js              | 2 +-
 client/src/routes/standardUser/ReportHistory.js               | 4 ++--
 10 files changed, 7 insertions(+), 7 deletions(-)
 rename client/src/components/{ => healthReport}/BloodReportUpload.js (100%)
 rename client/src/components/{ => healthReport}/DownloadReportButton.js (100%)
 rename client/src/components/{ => healthReport}/GenerateReportForm.js (100%)
 rename client/src/components/{ => healthReport}/HealthReportPDFFlat.js (99%)
 rename client/src/components/{ => healthReport}/MerchantReportForm.js (100%)
 rename client/src/components/{ => healthReport}/ReportTemplate.js (100%)

diff --git a/client/src/components/BloodReportUpload.js b/client/src/components/healthReport/BloodReportUpload.js
similarity index 100%
rename from client/src/components/BloodReportUpload.js
rename to client/src/components/healthReport/BloodReportUpload.js
diff --git a/client/src/components/DownloadReportButton.js b/client/src/components/healthReport/DownloadReportButton.js
similarity index 100%
rename from client/src/components/DownloadReportButton.js
rename to client/src/components/healthReport/DownloadReportButton.js
diff --git a/client/src/components/GenerateReportForm.js b/client/src/components/healthReport/GenerateReportForm.js
similarity index 100%
rename from client/src/components/GenerateReportForm.js
rename to client/src/components/healthReport/GenerateReportForm.js
diff --git a/client/src/components/HealthReportPDFFlat.js b/client/src/components/healthReport/HealthReportPDFFlat.js
similarity index 99%
rename from client/src/components/HealthReportPDFFlat.js
rename to client/src/components/healthReport/HealthReportPDFFlat.js
index 0312fe5b..9ed4645a 100644
--- a/client/src/components/HealthReportPDFFlat.js
+++ b/client/src/components/healthReport/HealthReportPDFFlat.js
@@ -6,7 +6,7 @@ import {
   StyleSheet,
   Image,
 } from "@react-pdf/renderer";
-import WellAiLogo from "../assets/WellAiLogoTR.png";
+import WellAiLogo from "../../assets/WellAiLogoTR.png";
 
 /**
  * The document used for converting a health report to a PDF File.
diff --git a/client/src/components/MerchantReportForm.js b/client/src/components/healthReport/MerchantReportForm.js
similarity index 100%
rename from client/src/components/MerchantReportForm.js
rename to client/src/components/healthReport/MerchantReportForm.js
diff --git a/client/src/components/ReportTemplate.js b/client/src/components/healthReport/ReportTemplate.js
similarity index 100%
rename from client/src/components/ReportTemplate.js
rename to client/src/components/healthReport/ReportTemplate.js
diff --git a/client/src/routes/merchant/MerchantGenerateReport.js b/client/src/routes/merchant/MerchantGenerateReport.js
index 7fc80438..f9dc16a4 100644
--- a/client/src/routes/merchant/MerchantGenerateReport.js
+++ b/client/src/routes/merchant/MerchantGenerateReport.js
@@ -1,5 +1,5 @@
 import { Container, ButtonGroup, Button, Box } from "@mui/material";
-import MerchantReportForm from "../../components/MerchantReportForm";
+import MerchantReportForm from "../../components/healthReport/MerchantReportForm";
 import { useState } from "react";
 
 /**
diff --git a/client/src/routes/merchant/MerchantReports.js b/client/src/routes/merchant/MerchantReports.js
index 075c712e..abc1a0a6 100644
--- a/client/src/routes/merchant/MerchantReports.js
+++ b/client/src/routes/merchant/MerchantReports.js
@@ -1,5 +1,5 @@
-import ReportTemplate from "../../components/ReportTemplate";
-import DownloadReportButton from "../../components/DownloadReportButton";
+import ReportTemplate from "../../components/healthReport/ReportTemplate";
+import DownloadReportButton from "../../components/healthReport/DownloadReportButton";
 import CloseIcon from "@mui/icons-material/Close";
 import IconButton from "@mui/material/IconButton";
 import KeyboardArrowDownIcon from "@mui/icons-material/KeyboardArrowDown";
diff --git a/client/src/routes/standardUser/GenerateReport.js b/client/src/routes/standardUser/GenerateReport.js
index 1f4d1b01..2b49cb83 100644
--- a/client/src/routes/standardUser/GenerateReport.js
+++ b/client/src/routes/standardUser/GenerateReport.js
@@ -1,4 +1,4 @@
-import GenerateReportForm from "../../components/GenerateReportForm";
+import GenerateReportForm from "../../components/healthReport/GenerateReportForm";
 import { Box } from "@mui/material";
 
 /**
diff --git a/client/src/routes/standardUser/ReportHistory.js b/client/src/routes/standardUser/ReportHistory.js
index 738ce1b3..7f100f6b 100644
--- a/client/src/routes/standardUser/ReportHistory.js
+++ b/client/src/routes/standardUser/ReportHistory.js
@@ -1,5 +1,5 @@
-import ReportTemplate from "../../components/ReportTemplate";
-import DownloadReportButton from "../../components/DownloadReportButton";
+import ReportTemplate from "../../components/healthReport/ReportTemplate";
+import DownloadReportButton from "../../components/healthReport/DownloadReportButton";
 import CloseIcon from "@mui/icons-material/Close";
 import IconButton from "@mui/material/IconButton";
 import MenuIcon from "@mui/icons-material/Menu";

From 2a7770a4bb1b5e851ff91c4c3cd8e9f874927ca1 Mon Sep 17 00:00:00 2001
From: Luke Bradley <bralc003@mymail.unisa.edu.au>
Date: Sat, 23 May 2026 13:29:19 +0930
Subject: [PATCH 057/105] Create dialog and patientAccessRequest component
 folders

---
 client/src/components/Navbar.js                               | 4 ++--
 client/src/components/administrator/AccountApprovalTable.js   | 2 +-
 client/src/components/administrator/UserManagementTable.js    | 2 +-
 client/src/components/{ => dialog}/DisclaimerPolicy.js        | 0
 client/src/components/{ => dialog}/PrivacyNotice.js           | 0
 client/src/components/{ => dialog}/confirmationDialog.js      | 0
 .../{ => patientAccessRequest}/AcceptRequestForm.js           | 0
 .../{ => patientAccessRequest}/RequestPatientAccessForm.js    | 2 +-
 client/src/routes/merchant/MerchantReports.js                 | 2 +-
 client/src/routes/merchant/PatientManagement.js               | 2 +-
 client/src/routes/merchant/RequestPatientAccess.js            | 2 +-
 client/src/routes/standardUser/AcceptAccessRequest.js         | 2 +-
 client/src/routes/standardUser/ReportHistory.js               | 2 +-
 client/src/routes/standardUser/UserSettings.js                | 2 +-
 14 files changed, 11 insertions(+), 11 deletions(-)
 rename client/src/components/{ => dialog}/DisclaimerPolicy.js (100%)
 rename client/src/components/{ => dialog}/PrivacyNotice.js (100%)
 rename client/src/components/{ => dialog}/confirmationDialog.js (100%)
 rename client/src/components/{ => patientAccessRequest}/AcceptRequestForm.js (100%)
 rename client/src/components/{ => patientAccessRequest}/RequestPatientAccessForm.js (98%)

diff --git a/client/src/components/Navbar.js b/client/src/components/Navbar.js
index 3a9843b6..8a9d3eb4 100644
--- a/client/src/components/Navbar.js
+++ b/client/src/components/Navbar.js
@@ -18,8 +18,8 @@ import {
   Backdrop,
 } from "@mui/material";
 import { UserContext } from "../utils/UserContext";
-import PrivacyNotice from "./PrivacyNotice";
-import DisclaimerPolicy from "./DisclaimerPolicy";
+import PrivacyNotice from "./dialog/PrivacyNotice";
+import DisclaimerPolicy from "./dialog/DisclaimerPolicy";
 
 // Icons
 import AccountCircleIcon from "@mui/icons-material/AccountCircle";
diff --git a/client/src/components/administrator/AccountApprovalTable.js b/client/src/components/administrator/AccountApprovalTable.js
index 9b2ae6cc..9d2ae3b8 100644
--- a/client/src/components/administrator/AccountApprovalTable.js
+++ b/client/src/components/administrator/AccountApprovalTable.js
@@ -1,7 +1,7 @@
 import { useState, useEffect } from "react";
 import { Paper, Button, Box } from "@mui/material";
 import { DataGrid } from "@mui/x-data-grid";
-import ConfirmationDialog from "../confirmationDialog";
+import ConfirmationDialog from "../dialog/confirmationDialog";
 
 const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
 
diff --git a/client/src/components/administrator/UserManagementTable.js b/client/src/components/administrator/UserManagementTable.js
index 0a9ae480..4c28ac26 100644
--- a/client/src/components/administrator/UserManagementTable.js
+++ b/client/src/components/administrator/UserManagementTable.js
@@ -9,7 +9,7 @@ import {
 } from "@mui/material";
 import { DataGrid } from "@mui/x-data-grid";
 import { useState, useEffect, useCallback } from "react";
-import ConfirmationDialog from "../confirmationDialog";
+import ConfirmationDialog from "../dialog/confirmationDialog";
 import UserSearchBar from "./UserSearchBar";
 import UserToolBar from "./UserToolBar";
 import * as React from "react";
diff --git a/client/src/components/DisclaimerPolicy.js b/client/src/components/dialog/DisclaimerPolicy.js
similarity index 100%
rename from client/src/components/DisclaimerPolicy.js
rename to client/src/components/dialog/DisclaimerPolicy.js
diff --git a/client/src/components/PrivacyNotice.js b/client/src/components/dialog/PrivacyNotice.js
similarity index 100%
rename from client/src/components/PrivacyNotice.js
rename to client/src/components/dialog/PrivacyNotice.js
diff --git a/client/src/components/confirmationDialog.js b/client/src/components/dialog/confirmationDialog.js
similarity index 100%
rename from client/src/components/confirmationDialog.js
rename to client/src/components/dialog/confirmationDialog.js
diff --git a/client/src/components/AcceptRequestForm.js b/client/src/components/patientAccessRequest/AcceptRequestForm.js
similarity index 100%
rename from client/src/components/AcceptRequestForm.js
rename to client/src/components/patientAccessRequest/AcceptRequestForm.js
diff --git a/client/src/components/RequestPatientAccessForm.js b/client/src/components/patientAccessRequest/RequestPatientAccessForm.js
similarity index 98%
rename from client/src/components/RequestPatientAccessForm.js
rename to client/src/components/patientAccessRequest/RequestPatientAccessForm.js
index 53653fdd..8c8e2dc0 100644
--- a/client/src/components/RequestPatientAccessForm.js
+++ b/client/src/components/patientAccessRequest/RequestPatientAccessForm.js
@@ -9,7 +9,7 @@ import {
   Link,
   Divider,
 } from "@mui/material";
-import EmailInputField from "./authentication/EmailInputField";
+import EmailInputField from "../authentication/EmailInputField";
 
 const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
 
diff --git a/client/src/routes/merchant/MerchantReports.js b/client/src/routes/merchant/MerchantReports.js
index abc1a0a6..03163d6c 100644
--- a/client/src/routes/merchant/MerchantReports.js
+++ b/client/src/routes/merchant/MerchantReports.js
@@ -4,7 +4,7 @@ import CloseIcon from "@mui/icons-material/Close";
 import IconButton from "@mui/material/IconButton";
 import KeyboardArrowDownIcon from "@mui/icons-material/KeyboardArrowDown";
 import KeyboardArrowUpIcon from "@mui/icons-material/KeyboardArrowUp";
-import ConfirmationDialog from "../../components/confirmationDialog";
+import ConfirmationDialog from "../../components/dialog/confirmationDialog";
 import React, { useState, useEffect } from "react";
 import { useLocation } from "react-router-dom";
 import {
diff --git a/client/src/routes/merchant/PatientManagement.js b/client/src/routes/merchant/PatientManagement.js
index 565e9175..fbf6a874 100644
--- a/client/src/routes/merchant/PatientManagement.js
+++ b/client/src/routes/merchant/PatientManagement.js
@@ -1,6 +1,6 @@
 import { useState, useEffect } from "react";
 import { useNavigate } from "react-router-dom";
-import ConfirmationDialog from "../../components/confirmationDialog";
+import ConfirmationDialog from "../../components/dialog/confirmationDialog";
 import InputAdornment from "@mui/material/InputAdornment";
 import {
   Box,
diff --git a/client/src/routes/merchant/RequestPatientAccess.js b/client/src/routes/merchant/RequestPatientAccess.js
index 16afe84f..7c8e2a6b 100644
--- a/client/src/routes/merchant/RequestPatientAccess.js
+++ b/client/src/routes/merchant/RequestPatientAccess.js
@@ -8,7 +8,7 @@ import {
   Divider,
 } from "@mui/material";
 import ForgotPasswordForm from "../../components/authentication/ForgotPasswordForm";
-import RequestPatientAccessForm from "../../components/RequestPatientAccessForm";
+import RequestPatientAccessForm from "../../components/patientAccessRequest/RequestPatientAccessForm";
 
 /**
  * A page that displays the form to request access to a patients record.
diff --git a/client/src/routes/standardUser/AcceptAccessRequest.js b/client/src/routes/standardUser/AcceptAccessRequest.js
index c1b670e4..853b6927 100644
--- a/client/src/routes/standardUser/AcceptAccessRequest.js
+++ b/client/src/routes/standardUser/AcceptAccessRequest.js
@@ -7,7 +7,7 @@ import {
   Link,
   Divider,
 } from "@mui/material";
-import AcceptRequestForm from "../../components/AcceptRequestForm";
+import AcceptRequestForm from "../../components/patientAccessRequest/AcceptRequestForm";
 
 /**
  * A page that displays the accept access request form for users to
diff --git a/client/src/routes/standardUser/ReportHistory.js b/client/src/routes/standardUser/ReportHistory.js
index 7f100f6b..81098b0f 100644
--- a/client/src/routes/standardUser/ReportHistory.js
+++ b/client/src/routes/standardUser/ReportHistory.js
@@ -3,7 +3,7 @@ import DownloadReportButton from "../../components/healthReport/DownloadReportBu
 import CloseIcon from "@mui/icons-material/Close";
 import IconButton from "@mui/material/IconButton";
 import MenuIcon from "@mui/icons-material/Menu";
-import ConfirmationDialog from "../../components/confirmationDialog";
+import ConfirmationDialog from "../../components/dialog/confirmationDialog";
 import Stack from "@mui/material/Stack";
 import React, { useState, useEffect } from "react";
 import KeyboardArrowDownIcon from "@mui/icons-material/KeyboardArrowDown";
diff --git a/client/src/routes/standardUser/UserSettings.js b/client/src/routes/standardUser/UserSettings.js
index 93de7862..866d0f85 100644
--- a/client/src/routes/standardUser/UserSettings.js
+++ b/client/src/routes/standardUser/UserSettings.js
@@ -18,7 +18,7 @@ import {
   Tabs,
   Tab,
 } from "@mui/material";
-import ConfirmationDialog from "../../components/confirmationDialog";
+import ConfirmationDialog from "../../components/dialog/confirmationDialog";
 import { useNavigate } from "react-router-dom";
 import { UserContext } from "../../utils/UserContext";
 import PhoneInputField from "../../components/authentication/PhoneInputField";

From 3af655e330d2d8b11d6a2ab62abec479e9ba389f Mon Sep 17 00:00:00 2001
From: Luke Bradley <bralc003@mymail.unisa.edu.au>
Date: Sat, 23 May 2026 14:08:19 +0930
Subject: [PATCH 058/105] Remove unused imports

---
 client/src/routes/ReportHistory.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/client/src/routes/ReportHistory.js b/client/src/routes/ReportHistory.js
index 74309478..0ebae81d 100644
--- a/client/src/routes/ReportHistory.js
+++ b/client/src/routes/ReportHistory.js
@@ -20,12 +20,10 @@ import {
   Select,
   MenuItem,
   Button,
-  Drawer,
   useTheme,
   useMediaQuery,
   Paper,
 } from "@mui/material";
-import { textAlign } from "@mui/system";
 
 const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
 

From 0df3341f49128dd8a0e9405ea5748a0f9dc66a09 Mon Sep 17 00:00:00 2001
From: birjd002 <birjd002@mymail.unisa.edu.au>
Date: Sat, 23 May 2026 15:22:49 +0930
Subject: [PATCH 059/105] feat: add chart component for PDF rendering

---
 client/src/components/PDFHealthChart.js | 252 ++++++++++++++++++++++++
 1 file changed, 252 insertions(+)
 create mode 100644 client/src/components/PDFHealthChart.js

diff --git a/client/src/components/PDFHealthChart.js b/client/src/components/PDFHealthChart.js
new file mode 100644
index 00000000..4e53ce02
--- /dev/null
+++ b/client/src/components/PDFHealthChart.js
@@ -0,0 +1,252 @@
+import React, { useMemo, forwardRef } from "react";
+import {
+  Box,
+  Typography,
+  Card,
+  CardContent,
+  useTheme,
+} from "@mui/material";
+import { LineChart } from "@mui/x-charts/LineChart";
+
+const formatXAxisLabel = (label, index, total) => {
+  if (!label) {
+    return label;
+  }
+
+  // Thin out middle ticks for crowded datasets on smaller screens
+  if (total > 4 && index > 0 && index < total - 1) {
+    if (total > 6 && index % 2 === 1) {
+      return "";
+    }
+  }
+
+  if (/^\d{4}-\d{2}-\d{2}$/.test(label)) {
+    const [, month, day] = label.split("-");
+    return `${month}/${day}`;
+  }
+
+  const parts = label.split(" ");
+  if (parts.length === 2 && parts[1].length === 4) {
+    return parts[0];
+  }
+
+  return label;
+};
+
+/**
+ * A Component that displays the trends in the user's health based on
+ * their report history. Used for PDF download.
+ *
+ * @returns {@mui.material.Box}
+ */
+const PDFHealthChart = forwardRef(({ healthData }, ref) => {
+  const theme = useTheme();
+
+  // Helpers for aggregation and y-axis scaling
+  const colors = [theme.palette.primary.main, "#ff7043", "#42a5f5"];
+
+  const { xAxisData, chartSeries, yAxisMax } = useMemo(() => {
+    if (!healthData || healthData.length === 0) {
+      return { xAxisData: [], chartSeries: [], yAxisMax: 60 };
+    }
+
+    // Parse dates and sort ascending
+    const parsed = healthData
+      .map((d) => {
+        const dt = d.date ? new Date(d.date) : null;
+        return { ...d, _dateObj: dt };
+      })
+      .filter((d) => d._dateObj && !isNaN(d._dateObj.getTime()))
+      .sort((a, b) => a._dateObj - b._dateObj);
+
+    if (parsed.length === 0) {
+      return { xAxisData: [], chartSeries: [], yAxisMax: 60 };
+    }
+
+    const minDate = parsed[0]._dateObj;
+    const maxDate = parsed[parsed.length - 1]._dateObj;
+    const crossYear = minDate.getFullYear() !== maxDate.getFullYear();
+    const diffDays = (maxDate - minDate) / (1000 * 60 * 60 * 24);
+
+    const needAggregateMonthly =
+      crossYear || diffDays > 180 || parsed.length > 20;
+
+    let working = [];
+    let xLabels = [];
+
+    if (needAggregateMonthly) {
+      // Group by year-month and compute averages
+      const groups = new Map();
+      for (const d of parsed) {
+        const y = d._dateObj.getFullYear();
+        const m = d._dateObj.getMonth(); // 0-11
+        const key = `${y}-${m}`;
+        if (!groups.has(key)) {
+          groups.set(key, { y, m, items: [] });
+        }
+        groups.get(key).items.push(d);
+      }
+
+      const monthNames = [
+        "Jan",
+        "Feb",
+        "Mar",
+        "Apr",
+        "May",
+        "Jun",
+        "Jul",
+        "Aug",
+        "Sep",
+        "Oct",
+        "Nov",
+        "Dec",
+      ];
+      const aggregated = Array.from(groups.values())
+        .sort((a, b) => a.y - b.y || a.m - b.m)
+        .map(({ y, m, items }) => {
+          const n = items.length || 1;
+          const avg = (arr, key) =>
+            arr.reduce((sum, it) => sum + (Number(it[key]) || 0), 0) / n;
+          return {
+            label: `${monthNames[m]} ${y}`,
+            strokeProbability: avg(items, "strokeProbability"),
+            cardioProbability: avg(items, "cardioProbability"),
+            diabetesProbability: avg(items, "diabetesProbability"),
+          };
+        });
+
+      working = aggregated;
+      xLabels = aggregated.map((a) => a.label);
+    } else {
+      // Use precise date points; format label as YYYY-MM-DD
+      const formatDate = (dt) => {
+        const y = dt.getFullYear();
+        const m = String(dt.getMonth() + 1).padStart(2, "0");
+        const d = String(dt.getDate()).padStart(2, "0");
+        return `${y}-${m}-${d}`;
+      };
+      working = parsed;
+      xLabels = parsed.map((d) => formatDate(d._dateObj));
+    }
+
+    // Build series based on selection
+    const series = [
+    {
+      data: working.map((w) => Number(w.strokeProbability) || 0),
+      label: "Stroke Probability (%)",
+      color: colors[0],
+    },
+    {
+      data: working.map((w) => Number(w.cardioProbability) || 0),
+      label: "Cardio Probability (%)",
+      color: colors[1],
+    },
+    {
+      data: working.map((w) => Number(w.diabetesProbability) || 0),
+      label: "Diabetes Probability (%)",
+      color: colors[2],
+    }
+  ];
+
+    // Dynamic y-axis max with padding, capped at 100
+    let maxVal = 0;
+    for (const s of series) {
+      for (const v of s.data) maxVal = Math.max(maxVal, Number(v) || 0);
+    }
+    const padded = Math.min(100, Math.max(0, maxVal + 5));
+    const yMax = Math.max(10, Math.min(100, Math.ceil(padded / 10) * 10));
+
+    return { xAxisData: xLabels, chartSeries: series, yAxisMax: yMax };
+  }, [healthData, colors]);
+
+  const xAxisValueFormatter = useMemo(() => {
+    if (!xAxisData || xAxisData.length === 0) {
+      return undefined;
+    }
+
+    return (value) => {
+      const index = xAxisData.indexOf(value);
+      if (index === -1) {
+        return value;
+      }
+      return formatXAxisLabel(value, index, xAxisData.length);
+    };
+  }, [xAxisData]);
+
+  return (
+    <Box
+      ref={ref}
+      sx={{
+        width: 750,
+      }}
+    >
+      <Card sx={{ borderRadius: 2, boxShadow: 24, bgcolor: "#ffffff", overflow: "hidden" }}>
+        <CardContent sx={{ p: 3, "&:last-child": { pb: 3 } }}>
+          <Typography
+            variant="h6"
+            gutterBottom
+            sx={{ fontWeight: 600, mb: 2 }}
+          >
+            Health Risk Trends Over Time
+          </Typography>
+            <Box
+              sx={{
+                width: "100%",
+                height: 420,
+                overflow: "visible",
+              }}
+            >
+              <LineChart
+                series={chartSeries}
+                xAxis={[
+                  {
+                    data: xAxisData,
+                    scaleType: "point",
+                    valueFormatter: xAxisValueFormatter,
+                    tickLabelStyle: {
+                      angle: 0,
+                      textAnchor: "middle",
+                      fontSize: 11,
+                      fill: "#666",
+                    },
+                  },
+                ]}
+                yAxis={[
+                  {
+                    label: "Probability (%)",
+                    min: 0,
+                    max: yAxisMax,
+                    tickLabelStyle: {
+                      fontSize: 12,
+                      fill: "#666",
+                    },
+                  },
+                ]}
+                margin={
+                    { left: 70, right: 30, top: 40, bottom: 70 }
+                }
+                grid={{ vertical: true, horizontal: true }}
+                slotProps={{
+                  legend: {
+                    direction: "row",
+                    position: { vertical: "top", horizontal: "middle" },
+                    padding: 0,
+                    itemMarkWidth: 20,
+                    itemMarkHeight: 2,
+                    markGap: 5,
+                    itemGap: 10,
+                    labelStyle: {
+                      fontSize: 12,
+                      fill: "#333",
+                    },
+                  },
+                }}
+              />
+            </Box>
+        </CardContent>
+      </Card>
+    </Box>
+  );
+});
+
+export default PDFHealthChart;
\ No newline at end of file

From 6a1dd66e14adad85f0561c0068511458e43e104c Mon Sep 17 00:00:00 2001
From: birjd002 <birjd002@mymail.unisa.edu.au>
Date: Sun, 24 May 2026 00:02:24 +0930
Subject: [PATCH 060/105] feat: add PDFHealthChart component to ReportHistory

---
 client/package-lock.json           | 95 ++++++++++++++++++++++++------
 client/package.json                |  1 +
 client/src/routes/ReportHistory.js | 20 ++++++-
 3 files changed, 98 insertions(+), 18 deletions(-)

diff --git a/client/package-lock.json b/client/package-lock.json
index 04b79646..1b7d690e 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -24,6 +24,7 @@
         "bootstrap": "^5.3.8",
         "dayjs": "^1.11.20",
         "file-saver": "^2.0.5",
+        "html2canvas": "^1.4.1",
         "libphonenumber-js": "^1.12.24",
         "react": "^19.1.1",
         "react-dom": "^19.1.1",
@@ -86,6 +87,7 @@
       "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.4.tgz",
       "integrity": "sha512-2BCOP7TN8M+gVDj7/ht3hsaO/B/n5oDbiAyyvnRlNOs+u1o+JWNYTQrmpuNp1/Wq2gcFrI01JAW+paEKDMx/CA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@babel/code-frame": "^7.27.1",
         "@babel/generator": "^7.28.3",
@@ -741,6 +743,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.27.1.tgz",
       "integrity": "sha512-p9OkPbZ5G7UT1MofwYFigGebnrzGJacoBSQM0/6bi/PUMVE+qlWDD/OalvQKbwgQzU6dl0xAv6r4X7Jme0RYxA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.27.1"
       },
@@ -1624,6 +1627,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.27.1.tgz",
       "integrity": "sha512-2KH4LWGSrJIkVf5tSiBFYuXDAoWRq2MMwgivCf+93dd0GQi8RXLjKA/0EvRnVV5G0hrHczsquXuD01L8s6dmBw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.27.1",
         "@babel/helper-module-imports": "^7.27.1",
@@ -2452,6 +2456,7 @@
       "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.14.0.tgz",
       "integrity": "sha512-O000MLDBDdk/EohJPFUqvnp4qnHeYkVP5B0xEG0D/L7cOKP9kefu2DXn8dj74cQfsEzUqh+sr1RzFqiL1o+PpA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.18.3",
         "@emotion/babel-plugin": "^11.13.5",
@@ -2495,6 +2500,7 @@
       "resolved": "https://registry.npmjs.org/@emotion/styled/-/styled-11.14.1.tgz",
       "integrity": "sha512-qEEJt42DuToa3gurlH4Qqc1kVpNq8wO8cJtDzU46TjlzWjDlsVyevtYCRijVq3SrHsROS+gVQ8Fnea108GnKzw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.18.3",
         "@emotion/babel-plugin": "^11.13.5",
@@ -3175,6 +3181,7 @@
       "resolved": "https://registry.npmjs.org/@mui/material/-/material-7.3.4.tgz",
       "integrity": "sha512-gEQL9pbJZZHT7lYJBKQCS723v1MGys2IFc94COXbUIyCTWa+qC77a7hUax4Yjd5ggEm35dk4AyYABpKKWC4MLw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.28.4",
         "@mui/core-downloads-tracker": "^7.3.4",
@@ -3285,6 +3292,7 @@
       "resolved": "https://registry.npmjs.org/@mui/system/-/system-7.3.3.tgz",
       "integrity": "sha512-Lqq3emZr5IzRLKaHPuMaLBDVaGvxoh6z7HMWd1RPKawBM5uMRaQ4ImsmmgXWtwJdfZux5eugfDhXJUo2mliS8Q==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.28.4",
         "@mui/private-theming": "^7.3.3",
@@ -3952,6 +3960,7 @@
       "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz",
       "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==",
       "license": "MIT",
+      "peer": true,
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/popperjs"
@@ -4493,6 +4502,7 @@
       "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.4.1.tgz",
       "integrity": "sha512-o4PXJQidqJl82ckFaXUeoAW+XysPLauYI43Abki5hABd853iMhitooc6znOnczgbTYmEP6U6/y1ZyKAIsvMKGg==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@babel/code-frame": "^7.10.4",
         "@babel/runtime": "^7.12.5",
@@ -5103,6 +5113,7 @@
       "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz",
       "integrity": "sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@eslint-community/regexpp": "^4.4.0",
         "@typescript-eslint/scope-manager": "5.62.0",
@@ -5156,6 +5167,7 @@
       "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.62.0.tgz",
       "integrity": "sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==",
       "license": "BSD-2-Clause",
+      "peer": true,
       "dependencies": {
         "@typescript-eslint/scope-manager": "5.62.0",
         "@typescript-eslint/types": "5.62.0",
@@ -5531,6 +5543,7 @@
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
       "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
       "license": "MIT",
+      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -5629,6 +5642,7 @@
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -6374,6 +6388,15 @@
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
       "license": "MIT"
     },
+    "node_modules/base64-arraybuffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz",
+      "integrity": "sha512-I3yl4r9QB5ZRY3XuJVEPfc2XhZO6YweFPI+UovAzn+8/hb3oJ6lnysaFcjVpkCPfVWFUDvoZ8kmVDP7WyRtYtQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6.0"
+      }
+    },
     "node_modules/base64-js": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
@@ -6630,6 +6653,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "baseline-browser-mapping": "^2.8.9",
         "caniuse-lite": "^1.0.30001746",
@@ -7474,6 +7498,15 @@
         "postcss": "^8.4"
       }
     },
+    "node_modules/css-line-break": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/css-line-break/-/css-line-break-2.1.0.tgz",
+      "integrity": "sha512-FHcKFCZcAha3LwfVBhCQbW2nCNbkZXn7KVUJcsT5/P8YmfsVja0FMPJr0B903j/E69HUphKiV9iQArX8SDYA4w==",
+      "license": "MIT",
+      "dependencies": {
+        "utrie": "^1.0.2"
+      }
+    },
     "node_modules/css-loader": {
       "version": "6.11.0",
       "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.11.0.tgz",
@@ -8805,6 +8838,7 @@
       "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==",
       "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
@@ -10791,6 +10825,19 @@
         }
       }
     },
+    "node_modules/html2canvas": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/html2canvas/-/html2canvas-1.4.1.tgz",
+      "integrity": "sha512-fPU6BHNpsyIhr8yyMpTLLxAbkaK8ArIBcmZIRiBLiDhjeqvXolaEmDGmELFuX9I4xDcaKKcJl+TKZLqruBbmWA==",
+      "license": "MIT",
+      "dependencies": {
+        "css-line-break": "^2.1.0",
+        "text-segmentation": "^1.0.3"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
     "node_modules/htmlparser2": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz",
@@ -11846,6 +11893,7 @@
       "resolved": "https://registry.npmjs.org/jest/-/jest-27.5.1.tgz",
       "integrity": "sha512-Yn0mADZB89zTtjkPJEXwrac3LHudkQMR+Paqa8uxJHCBr9agxztUifWCyiYrjhMPBoUVBjyny0I7XH6ozDr7QQ==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@jest/core": "^27.5.1",
         "import-local": "^3.0.2",
@@ -12731,6 +12779,7 @@
       "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.7.tgz",
       "integrity": "sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==",
       "license": "MIT",
+      "peer": true,
       "bin": {
         "jiti": "bin/jiti.js"
       }
@@ -14930,6 +14979,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "nanoid": "^3.3.11",
         "picocolors": "^1.1.1",
@@ -16064,6 +16114,7 @@
       "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
       "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "cssesc": "^3.0.0",
         "util-deprecate": "^1.0.2"
@@ -16556,6 +16607,7 @@
       "resolved": "https://registry.npmjs.org/react/-/react-19.2.0.tgz",
       "integrity": "sha512-tmbWg6W31tQLeB5cdIBOicJDJRR2KzXsV7uSK9iNfLWQ5bIZfxuPEHp7M8wiHyHnn0DD1i7w3Zmin0FtkrwoCQ==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -16687,6 +16739,7 @@
       "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.0.tgz",
       "integrity": "sha512-UlbRu4cAiGaIewkPyiRGJk0imDN2T3JjieT6spoL2UeSf5od4n5LB/mQ4ejmxhCFT1tYe8IvaFulzynWovsEFQ==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "scheduler": "^0.27.0"
       },
@@ -16821,6 +16874,7 @@
       "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.11.0.tgz",
       "integrity": "sha512-F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -17369,6 +17423,7 @@
       "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.2.tgz",
       "integrity": "sha512-fS6iqSPZDs3dr/y7Od6y5nha8dW1YnbgtsyotCVvoFGKbERG++CVRFv1meyGDE1SNItQA8BrnCw7ScdAhRJ3XQ==",
       "license": "MIT",
+      "peer": true,
       "bin": {
         "rollup": "dist/bin/rollup"
       },
@@ -17611,6 +17666,7 @@
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
       "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
         "fast-uri": "^3.0.1",
@@ -19040,23 +19096,6 @@
         }
       }
     },
-    "node_modules/tailwindcss/node_modules/yaml": {
-      "version": "2.8.3",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.3.tgz",
-      "integrity": "sha512-AvbaCLOO2Otw/lW5bmh9d/WEdcDFdQp2Z2ZUH3pX9U2ihyUY0nvLv7J6TrWowklRGPYbB/IuIMfYgxaCPg5Bpg==",
-      "license": "ISC",
-      "optional": true,
-      "peer": true,
-      "bin": {
-        "yaml": "bin.mjs"
-      },
-      "engines": {
-        "node": ">= 14.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/eemeli"
-      }
-    },
     "node_modules/tapable": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.3.0.tgz",
@@ -19234,6 +19273,15 @@
         "node": ">=8"
       }
     },
+    "node_modules/text-segmentation": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/text-segmentation/-/text-segmentation-1.0.3.tgz",
+      "integrity": "sha512-iOiPUo/BGnZ6+54OsWxZidGCsdU8YbE4PSpdPinp7DeMtUJNJBoJ/ouUSTJjHkh1KntHaltHl/gDs2FC4i5+Nw==",
+      "license": "MIT",
+      "dependencies": {
+        "utrie": "^1.0.2"
+      }
+    },
     "node_modules/text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
@@ -19479,6 +19527,7 @@
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
       "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
       "license": "(MIT OR CC0-1.0)",
+      "peer": true,
       "engines": {
         "node": ">=10"
       },
@@ -19931,6 +19980,15 @@
         "node": ">= 0.4.0"
       }
     },
+    "node_modules/utrie": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/utrie/-/utrie-1.0.2.tgz",
+      "integrity": "sha512-1MLa5ouZiOmQzUbjbu9VmjLzn1QLXBhwpUa7kdLUQK+KQ5KA9I1vk5U4YHe/X2Ch7PYnJfWuWT+VbuxbGwljhw==",
+      "license": "MIT",
+      "dependencies": {
+        "base64-arraybuffer": "^1.0.2"
+      }
+    },
     "node_modules/uuid": {
       "version": "8.3.2",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
@@ -20105,6 +20163,7 @@
       "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.102.0.tgz",
       "integrity": "sha512-hUtqAR3ZLVEYDEABdBioQCIqSoguHbFn1K7WlPPWSuXmx0031BD73PSE35jKyftdSh4YLDoQNgK4pqBt5Q82MA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@types/eslint-scope": "^3.7.7",
         "@types/estree": "^1.0.8",
@@ -20176,6 +20235,7 @@
       "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.15.2.tgz",
       "integrity": "sha512-0XavAZbNJ5sDrCbkpWL8mia0o5WPOd2YGtxrEiZkBK9FjLppIUK2TgxK6qGD2P3hUXTJNNPVibrerKcx5WkR1g==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@types/bonjour": "^3.5.9",
         "@types/connect-history-api-fallback": "^1.3.5",
@@ -20588,6 +20648,7 @@
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
       "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
         "fast-uri": "^3.0.1",
diff --git a/client/package.json b/client/package.json
index 4f779057..5e48a6eb 100644
--- a/client/package.json
+++ b/client/package.json
@@ -19,6 +19,7 @@
     "bootstrap": "^5.3.8",
     "dayjs": "^1.11.20",
     "file-saver": "^2.0.5",
+    "html2canvas": "^1.4.1",
     "libphonenumber-js": "^1.12.24",
     "react": "^19.1.1",
     "react-dom": "^19.1.1",
diff --git a/client/src/routes/ReportHistory.js b/client/src/routes/ReportHistory.js
index c67ceeb0..673b9775 100644
--- a/client/src/routes/ReportHistory.js
+++ b/client/src/routes/ReportHistory.js
@@ -5,9 +5,10 @@ import IconButton from "@mui/material/IconButton";
 import MenuIcon from "@mui/icons-material/Menu";
 import ConfirmationDialog from "../components/confirmationDialog";
 import Stack from "@mui/material/Stack";
-import React, { useState, useEffect } from "react";
+import React, { useState, useEffect, useRef } from "react";
 import KeyboardArrowDownIcon from "@mui/icons-material/KeyboardArrowDown";
 import KeyboardArrowUpIcon from "@mui/icons-material/KeyboardArrowUp";
+import PDFHealthChart from "../components/PDFHealthChart";
 
 import {
   Box,
@@ -44,6 +45,8 @@ const AIHealthPrediction = ({}) => {
   const [selectedMonth, setSelectedMonth] = useState(null);
   const [selectedYear, setSelectedYear] = useState(null);
   const [isOpen, setIsOpen] = useState(false);
+  const chartRef = useRef(null);
+  const [chartData, setChartData] = useState([]);
 
   function openBar() {
     if (isOpen === true) {
@@ -112,6 +115,16 @@ const AIHealthPrediction = ({}) => {
     setDeleteDialogOpen(false);
   }
 
+  // Health Analytics for Chart
+  useEffect(() => {
+    fetch(`${API_BASE}/health-analytics`, {
+      credentials: "include",
+    })
+    .then((r) => r.json())
+    .then(setChartData)
+    .catch(console.error);
+  }, []);
+
   // Extract and sort month and years for drop down.
   const years = [
     ...new Set(reportDates.map((r) => new Date(r.date).getFullYear())),
@@ -162,6 +175,10 @@ const AIHealthPrediction = ({}) => {
           mt: "66px",
         }}
       >
+        <div style={{ position: "fixed", top: -9999, left: -9999, pointerEvents: "none", overflow: "hidden", width: 0, height: 0 }}>
+          <PDFHealthChart ref={chartRef} healthData={chartData} />
+        </div>
+        
         <Drawer
           anchor="top"
           open={isOpen}
@@ -323,6 +340,7 @@ const AIHealthPrediction = ({}) => {
 
             <Box sx={{ flexGrow: 1 }} />
             <DownloadReportButton
+              chartRef={chartRef}
               healthDataId={selectedDate?.healthDataId}
               flatReportData={reportData}
               meta={{

From 39fa66f47846e11a96e6d0a3a4b89d39e7d21dd6 Mon Sep 17 00:00:00 2001
From: birjd002 <birjd002@mymail.unisa.edu.au>
Date: Sun, 24 May 2026 00:07:13 +0930
Subject: [PATCH 061/105] update: convert PDFHealthChart DOM node to png in
 DownloadReportButton

---
 client/src/components/DownloadReportButton.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/client/src/components/DownloadReportButton.js b/client/src/components/DownloadReportButton.js
index d7c14104..1c79aa84 100644
--- a/client/src/components/DownloadReportButton.js
+++ b/client/src/components/DownloadReportButton.js
@@ -3,6 +3,8 @@ import { saveAs } from "file-saver";
 import HealthReportPDFFlat from "./HealthReportPDFFlat";
 import { Button } from "@mui/material";
 import DownloadIcon from "@mui/icons-material/Download";
+import html2canvas from "html2canvas";
+
 
 /**
  * A simple button component to trigger a PDF report download for a specific health data ID.
@@ -23,6 +25,7 @@ const DownloadReportButton = ({
   flatReportData,
   meta,
   onError,
+  chartRef,
 }) => {
   const handleDownload = async () => {
     if (!flatReportData && !healthDataId) {
@@ -46,11 +49,16 @@ const DownloadReportButton = ({
       const fileName =
         meta?.fileNameHint ||
         `HealthReport_${String(meta?.healthDataID ?? healthDataId)}_${buildLocalDatePart(meta?.date)}.pdf`;
+      
+      const canvas = await html2canvas(chartRef.current);
+      const chartImage = canvas.toDataURL("image/png");
+
       const blob = await pdf(
         <HealthReportPDFFlat
           data={flatReportData}
           metaId={meta?.healthDataID ?? healthDataId}
           metaDate={meta?.date}
+          chartImage={chartImage}
         />,
       ).toBlob();
       saveAs(blob, fileName);

From e687363db6ce5f353279be811735e19344fe9bc2 Mon Sep 17 00:00:00 2001
From: birjd002 <birjd002@mymail.unisa.edu.au>
Date: Sun, 24 May 2026 00:09:10 +0930
Subject: [PATCH 062/105] feat: embed chartImage into PDF under session 3

Also removed title text and adjusted width of chart
---
 client/src/components/HealthReportPDFFlat.js | 23 +++++++++++++++++++-
 client/src/components/PDFHealthChart.js      |  9 +-------
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/client/src/components/HealthReportPDFFlat.js b/client/src/components/HealthReportPDFFlat.js
index 0312fe5b..20664682 100644
--- a/client/src/components/HealthReportPDFFlat.js
+++ b/client/src/components/HealthReportPDFFlat.js
@@ -98,6 +98,13 @@ const styles = StyleSheet.create({
     textDecoration: "underline",
     marginBottom: 5,
   },
+  chartSessionTitle: {
+    fontFamily: "Helvetica-Oblique",
+    fontSize: 12,
+    textDecoration: "underline",
+    marginBottom: 5,
+    marginTop: 30,
+  },
   table: {
     borderWidth: 1,
     borderColor: "#000",
@@ -191,6 +198,10 @@ const styles = StyleSheet.create({
     fontSize: 9,
     color: "#888",
   },
+  chartImage: {
+    marginTop: 5,
+    marginBottom: 30,
+  },
 });
 
 const getRisk = (val) => {
@@ -278,7 +289,7 @@ const renderParagraph = (text) => {
  * @param {Object} [props.metaDate] - Date the health report was generated
  * @returns {@react-pdf.renderer.Document}
  */
-const HealthReportPDFFlat = ({ data, metaId, metaDate }) => {
+const HealthReportPDFFlat = ({ data, metaId, metaDate, chartImage }) => {
   const dateObj = metaDate ? new Date(metaDate) : new Date();
   const dateStr = dateObj.toLocaleDateString("en-GB", {
     day: "numeric",
@@ -437,6 +448,16 @@ const HealthReportPDFFlat = ({ data, metaId, metaDate }) => {
             {renderParagraph(data.exerciseRecommendation)}
           </View>
 
+          {/* Session 3 */}
+          <Text style={styles.chartSessionTitle} break>
+            Session 3 – Health Trend Graph
+          </Text>
+
+          <Image
+            src={chartImage}
+            style={styles.chartImage}
+          />
+
           {/* Break hint: we want disclaimer to either stay at the end or push to next page. */}
           <Text style={[styles.disclaimer, { marginTop: 30 }]} break>
             Disclaimer: The information provided by this health prediction
diff --git a/client/src/components/PDFHealthChart.js b/client/src/components/PDFHealthChart.js
index 4e53ce02..bdc3e7c6 100644
--- a/client/src/components/PDFHealthChart.js
+++ b/client/src/components/PDFHealthChart.js
@@ -177,18 +177,11 @@ const PDFHealthChart = forwardRef(({ healthData }, ref) => {
     <Box
       ref={ref}
       sx={{
-        width: 750,
+        width: 1200,
       }}
     >
       <Card sx={{ borderRadius: 2, boxShadow: 24, bgcolor: "#ffffff", overflow: "hidden" }}>
         <CardContent sx={{ p: 3, "&:last-child": { pb: 3 } }}>
-          <Typography
-            variant="h6"
-            gutterBottom
-            sx={{ fontWeight: 600, mb: 2 }}
-          >
-            Health Risk Trends Over Time
-          </Typography>
             <Box
               sx={{
                 width: "100%",

From ef369bfac79fd316e12176b75023736a1ebbc007 Mon Sep 17 00:00:00 2001
From: birjd002 <birjd002@mymail.unisa.edu.au>
Date: Sun, 24 May 2026 01:00:44 +0930
Subject: [PATCH 063/105] feat: add chart component to MerchantReports

Also modified get_health_analytics to pass an optional health_data_id param to retrieve the patient id.
---
 client/src/routes/MerchantReports.js | 23 ++++++++++++++++++++++-
 server/routers/users.py              | 27 ++++++++++++++++++++++++---
 2 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/client/src/routes/MerchantReports.js b/client/src/routes/MerchantReports.js
index 39323b87..01a5db3b 100644
--- a/client/src/routes/MerchantReports.js
+++ b/client/src/routes/MerchantReports.js
@@ -5,7 +5,8 @@ import IconButton from "@mui/material/IconButton";
 import KeyboardArrowDownIcon from "@mui/icons-material/KeyboardArrowDown";
 import KeyboardArrowUpIcon from "@mui/icons-material/KeyboardArrowUp";
 import ConfirmationDialog from "../components/confirmationDialog";
-import React, { useState, useEffect } from "react";
+import PDFHealthChart from "../components/PDFHealthChart";
+import React, { useState, useEffect, useRef } from "react";
 import { useLocation } from "react-router-dom";
 import {
   Box,
@@ -51,6 +52,8 @@ const MerchantReports = ({}) => {
   const [reports, setReports] = useState([]); // Stores all report data
   const [selectedMonth, setSelectedMonth] = useState(null);
   const [selectedYear, setSelectedYear] = useState(null);
+  const chartRef = useRef(null);
+  const [chartData, setChartData] = useState([]);
 
   function fetchMerchantReports() {
     fetch(`${API_BASE}/merchants/reports`, {
@@ -132,6 +135,19 @@ const MerchantReports = ({}) => {
     setDeleteDialogOpen(false);
   }
 
+  // Health Analytics for Chart
+  useEffect(() => {
+    if (!selectedDate) {
+      return;
+    }
+    fetch(`${API_BASE}/health-analytics?health_data_id=${selectedDate.healthDataId}`, {
+      credentials: "include",
+    })
+    .then((r) => r.json())
+    .then(setChartData)
+    .catch(console.error);
+  }, [selectedDate]);
+
   // Extract and sort month and years for drop down.
   const years = [
     ...new Set(reportDates.map((r) => new Date(r.date).getFullYear())),
@@ -181,6 +197,10 @@ const MerchantReports = ({}) => {
         mt: "66px",
       }}
     >
+      <div style={{ position: "fixed", top: -9999, left: -9999, pointerEvents: "none", overflow: "hidden", width: 0, height: 0 }}>
+          <PDFHealthChart ref={chartRef} healthData={chartData} />
+      </div>
+
       {/* Top Bar */}
       <Drawer
         anchor="top"
@@ -362,6 +382,7 @@ const MerchantReports = ({}) => {
             <DownloadReportButton
               healthDataId={selectedDate?.healthDataId}
               flatReportData={reportData}
+              chartRef={chartRef}
               meta={{
                 date: selectedDate?.date,
                 healthDataId: selectedDate?.healthDataId,
diff --git a/server/routers/users.py b/server/routers/users.py
index 6ed5da15..09d09d91 100644
--- a/server/routers/users.py
+++ b/server/routers/users.py
@@ -454,13 +454,34 @@ async def delete_user(request: Request, db_conn: Session = Depends(get_db)):
 async def get_health_analytics(
     request: Request,
     db_conn: Session = Depends(get_db),
+    health_data_id: Optional[int] = None,
 ):
     """Return time-series health risk probabilities from the current user's historical predictions."""
     user_email = get_current_user(request, db_conn)
     patient = get_patient_by_email(user_email["email"], db_conn)
-    if not patient:
-        return []
-    patient_id = patient.PatientID
+
+    if not health_data_id:
+        if not patient:
+            return []
+        patient_id = patient.PatientID
+
+    else:
+        # Retrieve patientID from selected health report.
+        health_data = db_conn.query(HealthData).filter(HealthData.HealthDataID == health_data_id).first()
+        if not health_data:
+            raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Health data not found.")
+        
+        patient_id = health_data.PatientID
+
+        # Verify Merchant has access to patient.
+        merchant = db_conn.query(UserAccount).filter_by(Email=user_email["email"]).first()
+        merchant_access = (db_conn.query(UserPatientAccess)
+                        .filter(UserPatientAccess.UserID == merchant.UserID, UserPatientAccess.PatientID == patient_id)
+                        .first())
+                        
+        if not merchant_access:
+            raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="Impermissible action.")
+
 
     # Join predictions with health data to scope by user, order by prediction time
     rows = (

From e076df17ce6118eeb7f3127959d153ef9a2a0143 Mon Sep 17 00:00:00 2001
From: birjd002 <birjd002@mymail.unisa.edu.au>
Date: Sun, 24 May 2026 01:55:28 +0930
Subject: [PATCH 064/105] fix: remove drawer component

Accidentally merged into branch
---
 client/src/routes/MerchantReports.js | 11 -----------
 client/src/routes/ReportHistory.js   | 12 ------------
 2 files changed, 23 deletions(-)

diff --git a/client/src/routes/MerchantReports.js b/client/src/routes/MerchantReports.js
index 20fd4bb8..fd8709b1 100644
--- a/client/src/routes/MerchantReports.js
+++ b/client/src/routes/MerchantReports.js
@@ -203,17 +203,6 @@ const MerchantReports = ({}) => {
           <PDFHealthChart ref={chartRef} healthData={chartData} />
       </div>
 
-      {/* Top Bar */}
-      <Drawer
-        anchor="top"
-        open={isOpen}
-        onClose={() => setIsOpen(false)}
-        variant="temporary"
-        PaperProps={{
-          sx: {
-            p: 2,
-            maxHeight: "50vh",
-          },
       <Box
         sx={{
           bgcolor: "background.paper",
diff --git a/client/src/routes/ReportHistory.js b/client/src/routes/ReportHistory.js
index 7e25700b..310f1eac 100644
--- a/client/src/routes/ReportHistory.js
+++ b/client/src/routes/ReportHistory.js
@@ -180,18 +180,6 @@ const AIHealthPrediction = ({}) => {
           <PDFHealthChart ref={chartRef} healthData={chartData} />
         </div>
         
-        <Drawer
-          anchor="top"
-          open={isOpen}
-          onClose={() => setIsOpen(false)}
-          variant="temporary"
-          PaperProps={{
-            sx: {
-              p: 2,
-              maxHeight: "50vh",
-            },
-          }}
-        >
         <Paper variant="report-section">
           <Box sx={{ p: 3, borderBottom: "1px solid #e0e0e0" }}>
             <Typography

From 67ea28de6ee3480fcaaaab6912779806b99b378e Mon Sep 17 00:00:00 2001
From: Luke Bradley <bralc003@mymail.unisa.edu.au>
Date: Sun, 24 May 2026 11:44:23 +0930
Subject: [PATCH 065/105] Remove unused imports from login page

---
 client/src/components/authentication/LoginForm.js | 9 +++------
 client/src/routes/public/Login.js                 | 3 +--
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/client/src/components/authentication/LoginForm.js b/client/src/components/authentication/LoginForm.js
index 4a2e187b..6699f1f1 100644
--- a/client/src/components/authentication/LoginForm.js
+++ b/client/src/components/authentication/LoginForm.js
@@ -1,20 +1,17 @@
-import { useNavigate, useLocation, Link as RouterLink } from "react-router-dom";
-import { useContext, useState } from "react";
 import {
   Alert,
-  Box,
   Button,
-  Container,
   Card,
   CardContent,
   Divider,
-  Link,
   Stack,
   Typography,
 } from "@mui/material";
+import { useContext, useState } from "react";
+import { Link as RouterLink, useLocation, useNavigate } from "react-router-dom";
+import { UserContext } from "../../utils/UserContext";
 import EmailInputField from "../authentication/EmailInputField";
 import PasswordInputField from "../authentication/PasswordInputField";
-import { UserContext } from "../../utils/UserContext";
 
 const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
 
diff --git a/client/src/routes/public/Login.js b/client/src/routes/public/Login.js
index bde537d5..1f3ed332 100644
--- a/client/src/routes/public/Login.js
+++ b/client/src/routes/public/Login.js
@@ -1,6 +1,5 @@
-import { Box, Container, Stack, Typography } from "@mui/material";
+import { Box, Stack } from "@mui/material";
 import LoginForm from "../../components/authentication/LoginForm";
-import Logo from "../../assets/WellAiLogoTR.png";
 import WelcomePanel from "../../components/WelcomePanel";
 
 /**

From fe434fb12e8e5fd1487a40741e217567ad240cc8 Mon Sep 17 00:00:00 2001
From: Luke Bradley <bralc003@mymail.unisa.edu.au>
Date: Sun, 24 May 2026 11:51:42 +0930
Subject: [PATCH 066/105] Remove unused imports from all pages

---
 .../administrator/AccountApprovalTable.js     |  4 +--
 .../administrator/AuditLogSearchBar.js        |  2 +-
 .../components/administrator/AuditLogTable.js | 14 ++++----
 .../administrator/UserManagementTable.js      | 14 ++------
 .../components/administrator/UserSearchBar.js |  4 +--
 .../components/administrator/UserToolBar.js   |  2 +-
 .../analytics/ActiveMerchantsAnalytics.js     | 10 +-----
 .../analytics/ActiveUsersAnalytics.js         | 10 +-----
 .../analytics/AverageRiskSeriesAnalytics.js   | 15 ++++----
 .../analytics/LoginActivityAnalytics.js       | 13 ++-----
 .../analytics/PendingMerchantsAnalytics.js    | 12 ++-----
 .../RecentReportsGeneratedAnalytics.js        | 10 +-----
 .../analytics/UnvalidatedAccountAnalytics.js  | 10 +-----
 .../analytics/UserAccountAnalytics.js         | 11 +-----
 .../authentication/CreatePatientForm.js       | 20 +++++------
 .../authentication/EmailInputField.js         |  2 +-
 .../authentication/ForgotPasswordForm.js      | 10 +++---
 .../authentication/PhoneInputField.js         |  6 ++--
 .../authentication/RegistrationForm.js        | 14 ++++----
 .../authentication/ResetPasswordForm.js       |  8 ++---
 .../src/components/dialog/DisclaimerPolicy.js |  6 ++--
 client/src/components/dialog/PrivacyNotice.js |  6 ++--
 .../components/dialog/confirmationDialog.js   |  2 +-
 .../src/routes/admin/AdministratorApproval.js |  2 +-
 .../routes/admin/AdministratorDashboard.js    |  4 ---
 client/src/routes/admin/AdministratorLogs.js  |  3 +-
 client/src/routes/admin/AdministratorUsers.js |  2 +-
 .../routes/merchant/MerchantGenerateReport.js |  4 +--
 client/src/routes/merchant/MerchantLanding.js |  3 +-
 client/src/routes/merchant/MerchantReports.js | 30 +++++++---------
 client/src/routes/merchant/PatientDetails.js  | 18 ++++++----
 .../src/routes/merchant/PatientManagement.js  | 18 +++++-----
 .../routes/merchant/RequestPatientAccess.js   | 11 +-----
 client/src/routes/public/ErrorPage.js         |  3 +-
 .../standardUser/AcceptAccessRequest.js       | 10 +-----
 .../src/routes/standardUser/GenerateReport.js |  2 +-
 .../routes/standardUser/HealthAnalytics.js    | 24 ++++++-------
 .../src/routes/standardUser/ReportHistory.js  | 34 ++++++++++---------
 client/src/routes/standardUser/UserLanding.js |  8 ++---
 .../src/routes/standardUser/UserSettings.js   | 26 +++++++-------
 client/src/utils/LandingRoute.js              |  2 +-
 client/src/utils/ProtectedRoutes.js           |  2 +-
 client/src/utils/PublicOnlyRoutes.js          |  3 +-
 client/src/utils/UserContext.js               |  4 +--
 44 files changed, 165 insertions(+), 253 deletions(-)

diff --git a/client/src/components/administrator/AccountApprovalTable.js b/client/src/components/administrator/AccountApprovalTable.js
index 9d2ae3b8..efc4df2b 100644
--- a/client/src/components/administrator/AccountApprovalTable.js
+++ b/client/src/components/administrator/AccountApprovalTable.js
@@ -1,6 +1,6 @@
-import { useState, useEffect } from "react";
-import { Paper, Button, Box } from "@mui/material";
+import { Box, Button, Paper } from "@mui/material";
 import { DataGrid } from "@mui/x-data-grid";
+import { useEffect, useState } from "react";
 import ConfirmationDialog from "../dialog/confirmationDialog";
 
 const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
diff --git a/client/src/components/administrator/AuditLogSearchBar.js b/client/src/components/administrator/AuditLogSearchBar.js
index b98af4f3..f26e9740 100644
--- a/client/src/components/administrator/AuditLogSearchBar.js
+++ b/client/src/components/administrator/AuditLogSearchBar.js
@@ -1,5 +1,5 @@
 import SearchIcon from "@mui/icons-material/Search";
-import { TextField, InputAdornment, Box } from "@mui/material";
+import { Box, InputAdornment, TextField } from "@mui/material";
 import { memo, useEffect, useState } from "react";
 
 /**
diff --git a/client/src/components/administrator/AuditLogTable.js b/client/src/components/administrator/AuditLogTable.js
index 7e4c241e..68843858 100644
--- a/client/src/components/administrator/AuditLogTable.js
+++ b/client/src/components/administrator/AuditLogTable.js
@@ -1,14 +1,14 @@
-import { useCallback, useEffect, useState } from "react";
-import { DataGrid } from "@mui/x-data-grid";
 import {
-  Paper,
   Box,
-  Select,
-  MenuItem,
-  InputLabel,
-  FormControl,
   Divider,
+  FormControl,
+  InputLabel,
+  MenuItem,
+  Paper,
+  Select,
 } from "@mui/material";
+import { DataGrid } from "@mui/x-data-grid";
+import { useCallback, useEffect, useState } from "react";
 import AuditLogSearchBar from "./AuditLogSearchBar";
 
 const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
diff --git a/client/src/components/administrator/UserManagementTable.js b/client/src/components/administrator/UserManagementTable.js
index 4c28ac26..45e83bcb 100644
--- a/client/src/components/administrator/UserManagementTable.js
+++ b/client/src/components/administrator/UserManagementTable.js
@@ -1,18 +1,10 @@
-import {
-  Paper,
-  Box,
-  Snackbar,
-  Alert,
-  Stack,
-  Typography,
-  Divider,
-} from "@mui/material";
+import { Alert, Box, Divider, Paper, Snackbar } from "@mui/material";
 import { DataGrid } from "@mui/x-data-grid";
-import { useState, useEffect, useCallback } from "react";
+import * as React from "react";
+import { useCallback, useEffect, useState } from "react";
 import ConfirmationDialog from "../dialog/confirmationDialog";
 import UserSearchBar from "./UserSearchBar";
 import UserToolBar from "./UserToolBar";
-import * as React from "react";
 
 /**
  * A table listing all the user accounts in the system with tools to search
diff --git a/client/src/components/administrator/UserSearchBar.js b/client/src/components/administrator/UserSearchBar.js
index bc72c3ed..595f84e3 100644
--- a/client/src/components/administrator/UserSearchBar.js
+++ b/client/src/components/administrator/UserSearchBar.js
@@ -1,7 +1,7 @@
 import SearchIcon from "@mui/icons-material/Search";
-import { TextField, Box } from "@mui/material";
+import { Box, TextField } from "@mui/material";
 import InputAdornment from "@mui/material/InputAdornment";
-import { useEffect, useState, memo } from "react";
+import { memo, useEffect, useState } from "react";
 
 /**
  * A search bar that is used as an element in the UserManagementTable to
diff --git a/client/src/components/administrator/UserToolBar.js b/client/src/components/administrator/UserToolBar.js
index e57404a7..495d0a69 100644
--- a/client/src/components/administrator/UserToolBar.js
+++ b/client/src/components/administrator/UserToolBar.js
@@ -1,5 +1,5 @@
-import { Box, Select, Button, MenuItem } from "@mui/material";
 import DeleteForeverIcon from "@mui/icons-material/DeleteForever";
+import { Box, Button, MenuItem, Select } from "@mui/material";
 
 /**
  * A tool bar to that provides the controls for modifying and filtering user
diff --git a/client/src/components/administrator/analytics/ActiveMerchantsAnalytics.js b/client/src/components/administrator/analytics/ActiveMerchantsAnalytics.js
index cec30903..37ba18b6 100644
--- a/client/src/components/administrator/analytics/ActiveMerchantsAnalytics.js
+++ b/client/src/components/administrator/analytics/ActiveMerchantsAnalytics.js
@@ -1,12 +1,4 @@
-import {
-  Card,
-  CardContent,
-  Container,
-  Divider,
-  Paper,
-  Stack,
-  Typography,
-} from "@mui/material";
+import { Card, CardContent, Stack, Typography } from "@mui/material";
 import { useEffect, useState } from "react";
 
 const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
diff --git a/client/src/components/administrator/analytics/ActiveUsersAnalytics.js b/client/src/components/administrator/analytics/ActiveUsersAnalytics.js
index 782c02bc..079e8ab5 100644
--- a/client/src/components/administrator/analytics/ActiveUsersAnalytics.js
+++ b/client/src/components/administrator/analytics/ActiveUsersAnalytics.js
@@ -1,12 +1,4 @@
-import {
-  Card,
-  CardContent,
-  Container,
-  Divider,
-  Paper,
-  Stack,
-  Typography,
-} from "@mui/material";
+import { Card, CardContent, Stack, Typography } from "@mui/material";
 import { useEffect, useState } from "react";
 
 const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
diff --git a/client/src/components/administrator/analytics/AverageRiskSeriesAnalytics.js b/client/src/components/administrator/analytics/AverageRiskSeriesAnalytics.js
index b2351026..d31c06f4 100644
--- a/client/src/components/administrator/analytics/AverageRiskSeriesAnalytics.js
+++ b/client/src/components/administrator/analytics/AverageRiskSeriesAnalytics.js
@@ -1,20 +1,17 @@
 import {
   Card,
   CardContent,
-  Container,
-  Paper,
-  Typography,
-  Select,
-  MenuItem,
+  FormControl,
   Grid,
   InputLabel,
-  FormControl,
+  MenuItem,
+  Select,
+  Typography,
 } from "@mui/material";
-import { Stack } from "@mui/system";
-import { useEffect, useState } from "react";
-import { LineChart } from "@mui/x-charts/LineChart";
 import Divider from "@mui/material/Divider";
+import { LineChart } from "@mui/x-charts/LineChart";
 import dayjs from "dayjs";
+import { useEffect, useState } from "react";
 
 const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
 const DEFAULT_YEAR = 2026;
diff --git a/client/src/components/administrator/analytics/LoginActivityAnalytics.js b/client/src/components/administrator/analytics/LoginActivityAnalytics.js
index 32b816a3..8240027a 100644
--- a/client/src/components/administrator/analytics/LoginActivityAnalytics.js
+++ b/client/src/components/administrator/analytics/LoginActivityAnalytics.js
@@ -1,21 +1,14 @@
-import dayjs from "dayjs";
 import {
   Box,
   Card,
   CardContent,
-  Container,
-  FormControl,
+  Divider,
   Grid,
-  InputLabel,
-  MenuItem,
-  Paper,
-  Select,
-  Stack,
   Typography,
-  Divider,
 } from "@mui/material";
-import { useEffect, useState } from "react";
 import { BarChart } from "@mui/x-charts";
+import dayjs from "dayjs";
+import { useEffect, useState } from "react";
 
 const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
 const TIMESPAN_IN_DAYS = 7;
diff --git a/client/src/components/administrator/analytics/PendingMerchantsAnalytics.js b/client/src/components/administrator/analytics/PendingMerchantsAnalytics.js
index 0af169c0..8a43387b 100644
--- a/client/src/components/administrator/analytics/PendingMerchantsAnalytics.js
+++ b/client/src/components/administrator/analytics/PendingMerchantsAnalytics.js
@@ -1,14 +1,6 @@
-import {
-  Card,
-  CardContent,
-  Container,
-  Divider,
-  Paper,
-  Stack,
-  Typography,
-} from "@mui/material";
-import { useEffect, useState } from "react";
 import ErrorIcon from "@mui/icons-material/Error";
+import { Card, CardContent, Stack, Typography } from "@mui/material";
+import { useEffect, useState } from "react";
 
 const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
 
diff --git a/client/src/components/administrator/analytics/RecentReportsGeneratedAnalytics.js b/client/src/components/administrator/analytics/RecentReportsGeneratedAnalytics.js
index 8981e19b..8ab2e2d9 100644
--- a/client/src/components/administrator/analytics/RecentReportsGeneratedAnalytics.js
+++ b/client/src/components/administrator/analytics/RecentReportsGeneratedAnalytics.js
@@ -1,12 +1,4 @@
-import {
-  Card,
-  CardContent,
-  Container,
-  Divider,
-  Paper,
-  Stack,
-  Typography,
-} from "@mui/material";
+import { Card, CardContent, Stack, Typography } from "@mui/material";
 import { useEffect, useState } from "react";
 
 const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
diff --git a/client/src/components/administrator/analytics/UnvalidatedAccountAnalytics.js b/client/src/components/administrator/analytics/UnvalidatedAccountAnalytics.js
index cc5b4d90..68154c49 100644
--- a/client/src/components/administrator/analytics/UnvalidatedAccountAnalytics.js
+++ b/client/src/components/administrator/analytics/UnvalidatedAccountAnalytics.js
@@ -1,12 +1,4 @@
-import {
-  Card,
-  CardContent,
-  Container,
-  Divider,
-  Paper,
-  Stack,
-  Typography,
-} from "@mui/material";
+import { Card, CardContent, Stack, Typography } from "@mui/material";
 import { useEffect, useState } from "react";
 
 const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
diff --git a/client/src/components/administrator/analytics/UserAccountAnalytics.js b/client/src/components/administrator/analytics/UserAccountAnalytics.js
index 48d41840..ac4917e9 100644
--- a/client/src/components/administrator/analytics/UserAccountAnalytics.js
+++ b/client/src/components/administrator/analytics/UserAccountAnalytics.js
@@ -1,13 +1,4 @@
-import {
-  Card,
-  CardContent,
-  Container,
-  Divider,
-  Grid,
-  Paper,
-  Stack,
-  Typography,
-} from "@mui/material";
+import { Card, CardContent, Grid, Stack, Typography } from "@mui/material";
 import { useEffect, useState } from "react";
 
 const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
diff --git a/client/src/components/authentication/CreatePatientForm.js b/client/src/components/authentication/CreatePatientForm.js
index ee30e215..d58c925b 100644
--- a/client/src/components/authentication/CreatePatientForm.js
+++ b/client/src/components/authentication/CreatePatientForm.js
@@ -1,23 +1,23 @@
-import { useState } from "react";
-import { useNavigate } from "react-router-dom";
 import {
-  Container,
-  Paper,
-  Stack,
-  TextField,
-  Button,
   Alert,
+  Button,
+  Container,
   Dialog,
-  DialogTitle,
   DialogActions,
+  DialogTitle,
   Divider,
+  FormControl,
+  FormHelperText,
   InputLabel,
   MenuItem,
-  FormControl,
+  Paper,
   Select,
-  FormHelperText,
+  Stack,
+  TextField,
   Typography,
 } from "@mui/material";
+import { useState } from "react";
+import { useNavigate } from "react-router-dom";
 
 const FULL_NAME_MAX_LENGTH = 255;
 const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
diff --git a/client/src/components/authentication/EmailInputField.js b/client/src/components/authentication/EmailInputField.js
index 6a992aec..509d8aff 100644
--- a/client/src/components/authentication/EmailInputField.js
+++ b/client/src/components/authentication/EmailInputField.js
@@ -1,5 +1,5 @@
-import { useState } from "react";
 import { TextField } from "@mui/material";
+import { useState } from "react";
 import validator from "validator";
 
 /**
diff --git a/client/src/components/authentication/ForgotPasswordForm.js b/client/src/components/authentication/ForgotPasswordForm.js
index a4ca8fa6..35209cf6 100644
--- a/client/src/components/authentication/ForgotPasswordForm.js
+++ b/client/src/components/authentication/ForgotPasswordForm.js
@@ -1,5 +1,5 @@
-import { useState } from "react";
-import { Link as RouterLink } from "react-router-dom";
+import ForwardToInboxOutlinedIcon from "@mui/icons-material/ForwardToInboxOutlined";
+import PsychologyAltIcon from "@mui/icons-material/PsychologyAlt";
 import {
   Box,
   Button,
@@ -9,10 +9,10 @@ import {
   Stack,
   Typography,
 } from "@mui/material";
-import ForwardToInboxOutlinedIcon from "@mui/icons-material/ForwardToInboxOutlined";
-import PsychologyAltIcon from "@mui/icons-material/PsychologyAlt";
-import EmailInputField from "./EmailInputField";
+import { useState } from "react";
+import { Link as RouterLink } from "react-router-dom";
 import Logo from "../../assets/WellAiLogoTR.png";
+import EmailInputField from "./EmailInputField";
 
 const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
 
diff --git a/client/src/components/authentication/PhoneInputField.js b/client/src/components/authentication/PhoneInputField.js
index ce9358ab..31a225c6 100644
--- a/client/src/components/authentication/PhoneInputField.js
+++ b/client/src/components/authentication/PhoneInputField.js
@@ -1,10 +1,10 @@
-import { useState } from "react";
-import { TextField, FormControl, Grid, Box, Autocomplete } from "@mui/material";
+import { Autocomplete, Box, FormControl, Grid, TextField } from "@mui/material";
 import {
   getCountries,
-  parsePhoneNumberFromString,
   getCountryCallingCode,
+  parsePhoneNumberFromString,
 } from "libphonenumber-js";
+import { useState } from "react";
 
 /**
  * An input field that provides basic validation for phone numbers and a
diff --git a/client/src/components/authentication/RegistrationForm.js b/client/src/components/authentication/RegistrationForm.js
index 748feac8..9a9742c7 100644
--- a/client/src/components/authentication/RegistrationForm.js
+++ b/client/src/components/authentication/RegistrationForm.js
@@ -1,5 +1,5 @@
-import { useState, useEffect } from "react";
-import { useNavigate, Link as RouterLink } from "react-router-dom";
+import AccountBalanceIcon from "@mui/icons-material/AccountBalance";
+import AccountCircleIcon from "@mui/icons-material/AccountCircle";
 import {
   Alert,
   Box,
@@ -7,9 +7,9 @@ import {
   Card,
   CardContent,
   Dialog,
+  DialogActions,
   DialogContent,
   DialogTitle,
-  DialogActions,
   Divider,
   FormControl,
   FormHelperText,
@@ -20,12 +20,12 @@ import {
   TextField,
   Typography,
 } from "@mui/material";
-import AccountCircleIcon from "@mui/icons-material/AccountCircle";
-import AccountBalanceIcon from "@mui/icons-material/AccountBalance";
-import PasswordInputField from "../authentication/PasswordInputField";
+import { useEffect, useState } from "react";
+import { Link as RouterLink, useNavigate } from "react-router-dom";
+import Logo from "../../assets/WellAiLogoTR.png";
 import EmailInputField from "../authentication/EmailInputField";
+import PasswordInputField from "../authentication/PasswordInputField";
 import PhoneInputField from "../authentication/PhoneInputField";
-import Logo from "../../assets/WellAiLogoTR.png";
 
 const FULL_NAME_MAX_LENGTH = 255;
 const ACCOUNT_TYPES = Object.freeze({
diff --git a/client/src/components/authentication/ResetPasswordForm.js b/client/src/components/authentication/ResetPasswordForm.js
index 22e84d10..51f19108 100644
--- a/client/src/components/authentication/ResetPasswordForm.js
+++ b/client/src/components/authentication/ResetPasswordForm.js
@@ -1,4 +1,5 @@
-import { useState } from "react";
+import CheckIcon from "@mui/icons-material/Check";
+import LockResetIcon from "@mui/icons-material/LockReset";
 import {
   Box,
   Button,
@@ -9,9 +10,8 @@ import {
   TextField,
   Typography,
 } from "@mui/material";
-import { useParams, Link as RouterLink } from "react-router-dom";
-import CheckIcon from "@mui/icons-material/Check";
-import LockResetIcon from "@mui/icons-material/LockReset";
+import { useState } from "react";
+import { Link as RouterLink, useParams } from "react-router-dom";
 import Logo from "../../assets/WellAiLogoTR.png";
 import PasswordInputField from "../authentication/PasswordInputField";
 
diff --git a/client/src/components/dialog/DisclaimerPolicy.js b/client/src/components/dialog/DisclaimerPolicy.js
index e0f3716b..7cd331fa 100644
--- a/client/src/components/dialog/DisclaimerPolicy.js
+++ b/client/src/components/dialog/DisclaimerPolicy.js
@@ -1,10 +1,10 @@
 import {
-  Typography,
+  Box,
+  Button,
   Dialog,
   DialogContent,
   DialogTitle,
-  Box,
-  Button,
+  Typography,
 } from "@mui/material";
 
 /**
diff --git a/client/src/components/dialog/PrivacyNotice.js b/client/src/components/dialog/PrivacyNotice.js
index d28f6c2e..36aa251c 100644
--- a/client/src/components/dialog/PrivacyNotice.js
+++ b/client/src/components/dialog/PrivacyNotice.js
@@ -1,10 +1,10 @@
 import {
-  Typography,
+  Box,
+  Button,
   Dialog,
   DialogContent,
   DialogTitle,
-  Box,
-  Button,
+  Typography,
 } from "@mui/material";
 
 /**
diff --git a/client/src/components/dialog/confirmationDialog.js b/client/src/components/dialog/confirmationDialog.js
index 4084f58c..af768655 100644
--- a/client/src/components/dialog/confirmationDialog.js
+++ b/client/src/components/dialog/confirmationDialog.js
@@ -1,10 +1,10 @@
 import {
+  Button,
   Dialog,
   DialogActions,
   DialogContent,
   DialogContentText,
   DialogTitle,
-  Button,
 } from "@mui/material";
 
 /**
diff --git a/client/src/routes/admin/AdministratorApproval.js b/client/src/routes/admin/AdministratorApproval.js
index e7bf8030..1ef24148 100644
--- a/client/src/routes/admin/AdministratorApproval.js
+++ b/client/src/routes/admin/AdministratorApproval.js
@@ -1,5 +1,5 @@
+import { Box, Container, Divider, Stack, Typography } from "@mui/material";
 import AccountApprovalTable from "../../components/administrator/AccountApprovalTable";
-import { Box, Typography, Divider, Stack, Container } from "@mui/material";
 
 /**
  * A route that displays the merchant approval table where administrators
diff --git a/client/src/routes/admin/AdministratorDashboard.js b/client/src/routes/admin/AdministratorDashboard.js
index c2e1c8e4..913569fe 100644
--- a/client/src/routes/admin/AdministratorDashboard.js
+++ b/client/src/routes/admin/AdministratorDashboard.js
@@ -1,15 +1,11 @@
 import {
   Box,
-  Card,
-  CardContent,
   Container,
   Divider,
   Grid,
   Stack,
   Typography,
 } from "@mui/material";
-import { BarChart } from "@mui/x-charts/BarChart";
-import { useEffect, useState } from "react";
 import ActiveMerchantsAnalytics from "../../components/administrator/analytics/ActiveMerchantsAnalytics";
 import ActiveUsersAnalytics from "../../components/administrator/analytics/ActiveUsersAnalytics";
 import AverageRiskSeriesAnalytics from "../../components/administrator/analytics/AverageRiskSeriesAnalytics";
diff --git a/client/src/routes/admin/AdministratorLogs.js b/client/src/routes/admin/AdministratorLogs.js
index 2a58ecc7..3d5d68f4 100644
--- a/client/src/routes/admin/AdministratorLogs.js
+++ b/client/src/routes/admin/AdministratorLogs.js
@@ -1,6 +1,5 @@
+import { Box, Container, Divider, Stack, Typography } from "@mui/material";
 import AuditLogTable from "../../components/administrator/AuditLogTable";
-import { Box, Typography, Divider, Stack, Container } from "@mui/material";
-import AdministratorApproval from "./AdministratorApproval";
 
 /**
  * A route that provides tools to filter through and audit the systems logs.
diff --git a/client/src/routes/admin/AdministratorUsers.js b/client/src/routes/admin/AdministratorUsers.js
index 45e469e9..bf233254 100644
--- a/client/src/routes/admin/AdministratorUsers.js
+++ b/client/src/routes/admin/AdministratorUsers.js
@@ -1,5 +1,5 @@
+import { Box, Container, Divider, Stack, Typography } from "@mui/material";
 import UserManagementTable from "../../components/administrator/UserManagementTable";
-import { Box, Typography, Divider, Stack, Container } from "@mui/material";
 
 /**
  * A route that provides tools to manage, filter and search through the users of the
diff --git a/client/src/routes/merchant/MerchantGenerateReport.js b/client/src/routes/merchant/MerchantGenerateReport.js
index f9dc16a4..9c686619 100644
--- a/client/src/routes/merchant/MerchantGenerateReport.js
+++ b/client/src/routes/merchant/MerchantGenerateReport.js
@@ -1,6 +1,6 @@
-import { Container, ButtonGroup, Button, Box } from "@mui/material";
-import MerchantReportForm from "../../components/healthReport/MerchantReportForm";
+import { Box } from "@mui/material";
 import { useState } from "react";
+import MerchantReportForm from "../../components/healthReport/MerchantReportForm";
 
 /**
  * A page that provides the health report form for merchants to generate
diff --git a/client/src/routes/merchant/MerchantLanding.js b/client/src/routes/merchant/MerchantLanding.js
index 045f1584..dd420d4a 100644
--- a/client/src/routes/merchant/MerchantLanding.js
+++ b/client/src/routes/merchant/MerchantLanding.js
@@ -1,5 +1,4 @@
-import { Box, Typography, Card, CardContent } from "@mui/material";
-import { grid } from "@mui/system";
+import { Box, Card, CardContent, Typography } from "@mui/material";
 import { useEffect, useState } from "react";
 
 const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
diff --git a/client/src/routes/merchant/MerchantReports.js b/client/src/routes/merchant/MerchantReports.js
index c0d7d42e..62220ef0 100644
--- a/client/src/routes/merchant/MerchantReports.js
+++ b/client/src/routes/merchant/MerchantReports.js
@@ -1,31 +1,27 @@
-import ReportTemplate from "../../components/healthReport/ReportTemplate";
-import DownloadReportButton from "../../components/healthReport/DownloadReportButton";
 import CloseIcon from "@mui/icons-material/Close";
-import IconButton from "@mui/material/IconButton";
-import KeyboardArrowDownIcon from "@mui/icons-material/KeyboardArrowDown";
-import KeyboardArrowUpIcon from "@mui/icons-material/KeyboardArrowUp";
-import ConfirmationDialog from "../../components/dialog/confirmationDialog";
-import React, { useState, useEffect } from "react";
-import { useLocation } from "react-router-dom";
 import {
+  Autocomplete,
   Box,
-  Typography,
+  Button,
+  FormControl,
+  InputLabel,
   List,
   ListItem,
   ListItemText,
   MenuItem,
-  FormControl,
-  InputLabel,
+  Paper,
   Select,
-  Button,
-  Autocomplete,
   TextField,
-  Drawer,
-  Stack,
-  useTheme,
+  Typography,
   useMediaQuery,
-  Paper,
+  useTheme,
 } from "@mui/material";
+import IconButton from "@mui/material/IconButton";
+import { useEffect, useState } from "react";
+import { useLocation } from "react-router-dom";
+import ConfirmationDialog from "../../components/dialog/confirmationDialog";
+import DownloadReportButton from "../../components/healthReport/DownloadReportButton";
+import ReportTemplate from "../../components/healthReport/ReportTemplate";
 
 const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
 
diff --git a/client/src/routes/merchant/PatientDetails.js b/client/src/routes/merchant/PatientDetails.js
index 4eb54050..4ae741dc 100644
--- a/client/src/routes/merchant/PatientDetails.js
+++ b/client/src/routes/merchant/PatientDetails.js
@@ -1,15 +1,15 @@
 import {
   Box,
-  Typography,
+  Button,
   Card,
   CardContent,
-  Button,
-  useTheme,
+  Typography,
   useMediaQuery,
+  useTheme,
 } from "@mui/material";
-import { useState, useEffect } from "react";
-import { useNavigate, useParams } from "react-router-dom";
 import { BarChart } from "@mui/x-charts/BarChart";
+import { useEffect, useState } from "react";
+import { useNavigate, useParams } from "react-router-dom";
 
 // AppBar height: 56px toolbar + 2px border on mobile (xs), 64px + 2px on desktop (sm+)
 const APPBAR_HEIGHT = { xs: "58px", sm: "66px" };
@@ -231,7 +231,13 @@ const PatientDetails = () => {
                   >
                     {key.toUpperCase()}
                   </Typography>
-                  <Typography sx={{ fontSize: { xs: "1.4rem", sm: "2.125rem" }, fontWeight: 400, lineHeight: 1.2 }}>
+                  <Typography
+                    sx={{
+                      fontSize: { xs: "1.4rem", sm: "2.125rem" },
+                      fontWeight: 400,
+                      lineHeight: 1.2,
+                    }}
+                  >
                     {patientData?.risks?.[key]?.[0] ?? 0}%
                   </Typography>
                   <Box
diff --git a/client/src/routes/merchant/PatientManagement.js b/client/src/routes/merchant/PatientManagement.js
index fbf6a874..48c03332 100644
--- a/client/src/routes/merchant/PatientManagement.js
+++ b/client/src/routes/merchant/PatientManagement.js
@@ -1,25 +1,25 @@
-import { useState, useEffect } from "react";
-import { useNavigate } from "react-router-dom";
-import ConfirmationDialog from "../../components/dialog/confirmationDialog";
-import InputAdornment from "@mui/material/InputAdornment";
 import {
   Box,
-  Typography,
   Button,
-  Paper,
-  TextField,
+  Divider,
   Menu,
   MenuItem,
-  Divider,
+  Paper,
   Stack,
+  TextField,
+  Typography,
 } from "@mui/material";
+import InputAdornment from "@mui/material/InputAdornment";
 import { DataGrid } from "@mui/x-data-grid";
+import { useEffect, useState } from "react";
+import { useNavigate } from "react-router-dom";
+import ConfirmationDialog from "../../components/dialog/confirmationDialog";
 
 // Icons
 import DeleteIcon from "@mui/icons-material/Delete";
-import VisibilityIcon from "@mui/icons-material/Visibility";
 import KeyboardArrowDownIcon from "@mui/icons-material/KeyboardArrowDown";
 import SearchIcon from "@mui/icons-material/Search";
+import VisibilityIcon from "@mui/icons-material/Visibility";
 
 /**
  * A page used to display a list of all patients for a merchant user.
diff --git a/client/src/routes/merchant/RequestPatientAccess.js b/client/src/routes/merchant/RequestPatientAccess.js
index 7c8e2a6b..4da43a11 100644
--- a/client/src/routes/merchant/RequestPatientAccess.js
+++ b/client/src/routes/merchant/RequestPatientAccess.js
@@ -1,13 +1,4 @@
-import {
-  Box,
-  Container,
-  Stack,
-  Typography,
-  Button,
-  Link,
-  Divider,
-} from "@mui/material";
-import ForgotPasswordForm from "../../components/authentication/ForgotPasswordForm";
+import { Box, Container } from "@mui/material";
 import RequestPatientAccessForm from "../../components/patientAccessRequest/RequestPatientAccessForm";
 
 /**
diff --git a/client/src/routes/public/ErrorPage.js b/client/src/routes/public/ErrorPage.js
index c4ca9e26..0fc4ab8c 100644
--- a/client/src/routes/public/ErrorPage.js
+++ b/client/src/routes/public/ErrorPage.js
@@ -1,6 +1,5 @@
-import { Typography, Button, Box, Stack } from "@mui/material";
+import { Box, Button, Stack, Typography } from "@mui/material";
 import { useNavigate } from "react-router-dom";
-import Logo from "../../assets/WellAiLogoTR.png";
 
 /**
  * A page that is displayed when a user tried to navigate a non-existent
diff --git a/client/src/routes/standardUser/AcceptAccessRequest.js b/client/src/routes/standardUser/AcceptAccessRequest.js
index 853b6927..0acb0c43 100644
--- a/client/src/routes/standardUser/AcceptAccessRequest.js
+++ b/client/src/routes/standardUser/AcceptAccessRequest.js
@@ -1,12 +1,4 @@
-import {
-  Box,
-  Container,
-  Stack,
-  Typography,
-  Button,
-  Link,
-  Divider,
-} from "@mui/material";
+import { Box, Container } from "@mui/material";
 import AcceptRequestForm from "../../components/patientAccessRequest/AcceptRequestForm";
 
 /**
diff --git a/client/src/routes/standardUser/GenerateReport.js b/client/src/routes/standardUser/GenerateReport.js
index 2b49cb83..fcb6c214 100644
--- a/client/src/routes/standardUser/GenerateReport.js
+++ b/client/src/routes/standardUser/GenerateReport.js
@@ -1,5 +1,5 @@
-import GenerateReportForm from "../../components/healthReport/GenerateReportForm";
 import { Box } from "@mui/material";
+import GenerateReportForm from "../../components/healthReport/GenerateReportForm";
 
 /**
  * A page that provides the form for user's to generate a health report.
diff --git a/client/src/routes/standardUser/HealthAnalytics.js b/client/src/routes/standardUser/HealthAnalytics.js
index db46f3d5..f330f17d 100644
--- a/client/src/routes/standardUser/HealthAnalytics.js
+++ b/client/src/routes/standardUser/HealthAnalytics.js
@@ -1,24 +1,24 @@
-import React, { useState, useEffect, useMemo } from "react";
+import ExpandLessIcon from "@mui/icons-material/ExpandLess";
+import ExpandMoreIcon from "@mui/icons-material/ExpandMore";
 import {
   Box,
-  Container,
-  Typography,
+  Button,
   Card,
   CardContent,
-  Stack,
+  Checkbox,
+  Collapse,
+  Container,
   FormControl,
-  FormGroup,
   FormControlLabel,
-  Checkbox,
-  Button,
-  useTheme,
-  useMediaQuery,
+  FormGroup,
   IconButton,
-  Collapse,
+  Stack,
+  Typography,
+  useMediaQuery,
+  useTheme,
 } from "@mui/material";
-import ExpandMoreIcon from "@mui/icons-material/ExpandMore";
-import ExpandLessIcon from "@mui/icons-material/ExpandLess";
 import { LineChart } from "@mui/x-charts/LineChart";
+import { useEffect, useMemo, useState } from "react";
 
 const formatXAxisLabel = (label, index, total, isMobile) => {
   if (!label) {
diff --git a/client/src/routes/standardUser/ReportHistory.js b/client/src/routes/standardUser/ReportHistory.js
index 4f925b5b..88faae0b 100644
--- a/client/src/routes/standardUser/ReportHistory.js
+++ b/client/src/routes/standardUser/ReportHistory.js
@@ -1,28 +1,24 @@
-import ReportTemplate from "../../components/healthReport/ReportTemplate";
-import DownloadReportButton from "../../components/healthReport/DownloadReportButton";
 import CloseIcon from "@mui/icons-material/Close";
 import IconButton from "@mui/material/IconButton";
-import MenuIcon from "@mui/icons-material/Menu";
+import { useEffect, useState } from "react";
 import ConfirmationDialog from "../../components/dialog/confirmationDialog";
-import Stack from "@mui/material/Stack";
-import React, { useState, useEffect } from "react";
-import KeyboardArrowDownIcon from "@mui/icons-material/KeyboardArrowDown";
-import KeyboardArrowUpIcon from "@mui/icons-material/KeyboardArrowUp";
+import DownloadReportButton from "../../components/healthReport/DownloadReportButton";
+import ReportTemplate from "../../components/healthReport/ReportTemplate";
 
 import {
   Box,
-  Typography,
+  Button,
+  FormControl,
+  InputLabel,
   List,
   ListItem,
   ListItemText,
-  FormControl,
-  InputLabel,
-  Select,
   MenuItem,
-  Button,
-  useTheme,
-  useMediaQuery,
   Paper,
+  Select,
+  Typography,
+  useMediaQuery,
+  useTheme,
 } from "@mui/material";
 
 const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
@@ -118,8 +114,14 @@ const AIHealthPrediction = ({}) => {
   ].sort((a, b) => a - b);
 
   const months = [
-    ...new Set(reportDates.filter((r) => !selectedYear || new Date(r.date).getFullYear() === selectedYear,)
-    .map((r) => new Date(r.date).getMonth() + 1),),
+    ...new Set(
+      reportDates
+        .filter(
+          (r) =>
+            !selectedYear || new Date(r.date).getFullYear() === selectedYear,
+        )
+        .map((r) => new Date(r.date).getMonth() + 1),
+    ),
   ].sort((a, b) => a - b);
 
   // Filters reports based on selected year and month if any.
diff --git a/client/src/routes/standardUser/UserLanding.js b/client/src/routes/standardUser/UserLanding.js
index 8a5fccac..35e7cb02 100644
--- a/client/src/routes/standardUser/UserLanding.js
+++ b/client/src/routes/standardUser/UserLanding.js
@@ -1,15 +1,15 @@
 import {
+  Box,
   Card,
   CardContent,
-  Box,
   Divider,
   Typography,
-  useTheme,
   useMediaQuery,
+  useTheme,
 } from "@mui/material";
-import { useNavigate } from "react-router-dom";
-import { useEffect, useState } from "react";
 import { BarChart } from "@mui/x-charts/BarChart";
+import { useEffect, useState } from "react";
+import { useNavigate } from "react-router-dom";
 
 // AppBar height: 56px toolbar + 2px border on mobile (xs), 64px + 2px on desktop (sm+)
 const APPBAR_HEIGHT = { xs: "58px", sm: "66px" };
diff --git a/client/src/routes/standardUser/UserSettings.js b/client/src/routes/standardUser/UserSettings.js
index 866d0f85..2741e2ab 100644
--- a/client/src/routes/standardUser/UserSettings.js
+++ b/client/src/routes/standardUser/UserSettings.js
@@ -1,27 +1,27 @@
-import React, { useContext, useEffect, useMemo, useState } from "react";
 import {
+  Alert,
   Box,
-  Typography,
-  List,
-  ListItem,
-  ListItemText,
-  TextField,
   Button,
   FormControl,
   InputLabel,
-  Select,
+  List,
+  ListItem,
+  ListItemText,
   MenuItem,
-  Alert,
+  Select,
   Stack,
-  useTheme,
-  useMediaQuery,
-  Tabs,
   Tab,
+  Tabs,
+  TextField,
+  Typography,
+  useMediaQuery,
+  useTheme,
 } from "@mui/material";
-import ConfirmationDialog from "../../components/dialog/confirmationDialog";
+import { useContext, useEffect, useMemo, useState } from "react";
 import { useNavigate } from "react-router-dom";
-import { UserContext } from "../../utils/UserContext";
 import PhoneInputField from "../../components/authentication/PhoneInputField";
+import ConfirmationDialog from "../../components/dialog/confirmationDialog";
+import { UserContext } from "../../utils/UserContext";
 
 /**
  * A page that provides the tools for a user to securely update their
diff --git a/client/src/utils/LandingRoute.js b/client/src/utils/LandingRoute.js
index 388e2b30..7a72b836 100644
--- a/client/src/utils/LandingRoute.js
+++ b/client/src/utils/LandingRoute.js
@@ -1,5 +1,5 @@
-import { Navigate } from "react-router-dom";
 import { useEffect, useState } from "react";
+import { Navigate } from "react-router-dom";
 
 const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
 
diff --git a/client/src/utils/ProtectedRoutes.js b/client/src/utils/ProtectedRoutes.js
index bf1ca4be..9dff833a 100644
--- a/client/src/utils/ProtectedRoutes.js
+++ b/client/src/utils/ProtectedRoutes.js
@@ -1,5 +1,5 @@
-import { Outlet, Navigate, useLocation } from "react-router-dom";
 import { useEffect, useState } from "react";
+import { Navigate, Outlet, useLocation } from "react-router-dom";
 import NavBar from "../components/Navbar";
 
 const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
diff --git a/client/src/utils/PublicOnlyRoutes.js b/client/src/utils/PublicOnlyRoutes.js
index ef0b560d..852b9c8a 100644
--- a/client/src/utils/PublicOnlyRoutes.js
+++ b/client/src/utils/PublicOnlyRoutes.js
@@ -1,6 +1,5 @@
-import { Outlet, Navigate } from "react-router-dom";
 import { useEffect, useState } from "react";
-import NavBar from "../components/Navbar";
+import { Navigate, Outlet } from "react-router-dom";
 
 const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
 
diff --git a/client/src/utils/UserContext.js b/client/src/utils/UserContext.js
index 13c738af..66835553 100644
--- a/client/src/utils/UserContext.js
+++ b/client/src/utils/UserContext.js
@@ -1,9 +1,9 @@
 import {
   createContext,
-  useState,
+  useCallback,
   useEffect,
   useMemo,
-  useCallback,
+  useState,
 } from "react";
 
 export const UserContext = createContext(null);

From 28914a837d2006f26ae0424e059c9a0fbddc87fd Mon Sep 17 00:00:00 2001
From: Luke Bradley <bralc003@mymail.unisa.edu.au>
Date: Sun, 24 May 2026 11:57:45 +0930
Subject: [PATCH 067/105] Change href navigation to RouterLink in
 HealthAnalytics.js

---
 client/src/routes/standardUser/HealthAnalytics.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/client/src/routes/standardUser/HealthAnalytics.js b/client/src/routes/standardUser/HealthAnalytics.js
index f330f17d..51bc8b9f 100644
--- a/client/src/routes/standardUser/HealthAnalytics.js
+++ b/client/src/routes/standardUser/HealthAnalytics.js
@@ -19,6 +19,7 @@ import {
 } from "@mui/material";
 import { LineChart } from "@mui/x-charts/LineChart";
 import { useEffect, useMemo, useState } from "react";
+import { Link as RouterLink } from "react-router-dom";
 
 const formatXAxisLabel = (label, index, total, isMobile) => {
   if (!label) {
@@ -468,7 +469,8 @@ const HealthAnalytics = () => {
             >
               <Button
                 variant="outlined"
-                href="/report-history"
+                component={RouterLink}
+                to="/report-history"
                 sx={{
                   width: isMobile ? "100%" : "auto",
                   py: { xs: "0.8rem", sm: "0.6rem" },
@@ -480,7 +482,8 @@ const HealthAnalytics = () => {
               </Button>
               <Button
                 variant="contained"
-                href="/generate-report"
+                component={RouterLink}
+                to="/generate-report"
                 sx={{
                   width: isMobile ? "100%" : "auto",
                   py: { xs: "0.8rem", sm: "0.6rem" },

From 5ab1c0a7633be881f8a04c7919d24c58f3b653c3 Mon Sep 17 00:00:00 2001
From: Luke Bradley <bralc003@mymail.unisa.edu.au>
Date: Sun, 24 May 2026 12:05:58 +0930
Subject: [PATCH 068/105] Update font and mobile layout for HealthAnalytics.js

---
 .../routes/standardUser/HealthAnalytics.js    | 25 +++++++------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/client/src/routes/standardUser/HealthAnalytics.js b/client/src/routes/standardUser/HealthAnalytics.js
index 51bc8b9f..b0facc4b 100644
--- a/client/src/routes/standardUser/HealthAnalytics.js
+++ b/client/src/routes/standardUser/HealthAnalytics.js
@@ -291,16 +291,12 @@ const HealthAnalytics = () => {
           boxSizing: "border-box",
         }}
       >
-        <Stack spacing={1.5} sx={{ mb: 3 }}>
-          <Typography
-            variant={isMobile ? "h5" : "h4"}
-            component="h1"
-            color="primary"
-            sx={{ fontWeight: 600 }}
-          >
-            Health Analytics
-          </Typography>
-        </Stack>
+        <Typography
+          variant={isMobile ? "h4" : "h2"}
+          sx={{ textAlign: "center", mb: 2 }}
+        >
+          Health Analytics
+        </Typography>
 
         <Card sx={cardWrapperSx}>
           <CardContent sx={cardContentSx}>
@@ -312,9 +308,10 @@ const HealthAnalytics = () => {
                 mb: showSettings ? 2 : 0,
               }}
             >
-              <Typography variant="h6" sx={{ fontWeight: 600 }}>
+              <Typography variant={isMobile ? "h5" : "h4"}>
                 Probability Metrics Selection
               </Typography>
+
               {isMobile && (
                 <IconButton
                   onClick={() => setShowSettings(!showSettings)}
@@ -378,11 +375,7 @@ const HealthAnalytics = () => {
 
         <Card sx={cardWrapperSx}>
           <CardContent sx={chartCardContentSx}>
-            <Typography
-              variant="h6"
-              gutterBottom
-              sx={{ fontWeight: 600, mb: 2 }}
-            >
+            <Typography variant={isMobile ? "h5" : "h4"}>
               Health Risk Trends Over Time
             </Typography>
             {chartSeries.length > 0 && healthData.length > 0 ? (

From 29e2dab53771aa4e0e82a7969d73dde891f1fc7a Mon Sep 17 00:00:00 2001
From: Luke Bradley <bralc003@mymail.unisa.edu.au>
Date: Sun, 24 May 2026 12:23:02 +0930
Subject: [PATCH 069/105] Update user settings page UI layout

---
 .../authentication/PhoneInputField.js         | 59 ++++++++++---------
 .../src/routes/standardUser/UserSettings.js   | 35 +++--------
 2 files changed, 38 insertions(+), 56 deletions(-)

diff --git a/client/src/components/authentication/PhoneInputField.js b/client/src/components/authentication/PhoneInputField.js
index 31a225c6..4a9e051d 100644
--- a/client/src/components/authentication/PhoneInputField.js
+++ b/client/src/components/authentication/PhoneInputField.js
@@ -109,36 +109,37 @@ const PhoneInputField = ({ onChange, value }) => {
   }
 
   return (
-    <Box sx={{ flexGrow: 1 }}>
-      <Grid container spacing={2}>
-        <Grid size={7}>
-          <FormControl sx={{ width: "100%" }}>
-            <Autocomplete
-              options={getDialingCodeDropdownOptions()}
-              getOptionLabel={(option) => option.label}
-              renderInput={(params) => (
-                <TextField
-                  {...params}
-                  label="Dialing Code"
-                  error={!isValidDialingCode}
-                />
-              )}
-              onChange={updateDialingCode}
+    <Box
+      sx={{
+        display: "grid",
+        gridTemplateColumns: { xs: "1fr", md: "1fr 1fr" },
+        gap: 2,
+      }}
+    >
+      <FormControl sx={{ width: "100%" }}>
+        <Autocomplete
+          options={getDialingCodeDropdownOptions()}
+          getOptionLabel={(option) => option.label}
+          renderInput={(params) => (
+            <TextField
+              {...params}
+              label="Dialing Code"
+              error={!isValidDialingCode}
             />
-          </FormControl>
-        </Grid>
-        <Grid size={5}>
-          <TextField
-            error={!isValid}
-            id="outlined-input"
-            name="phone"
-            label="Phone"
-            value={value}
-            onChange={updatePhoneNumber}
-            sx={{ width: "100%" }}
-          ></TextField>
-        </Grid>
-      </Grid>
+          )}
+          onChange={updateDialingCode}
+        />
+      </FormControl>
+
+      <TextField
+        error={!isValid}
+        id="outlined-input"
+        name="phone"
+        label="Phone"
+        value={value}
+        onChange={updatePhoneNumber}
+        sx={{ width: "100%" }}
+      />
     </Box>
   );
 };
diff --git a/client/src/routes/standardUser/UserSettings.js b/client/src/routes/standardUser/UserSettings.js
index 2741e2ab..f0a44f98 100644
--- a/client/src/routes/standardUser/UserSettings.js
+++ b/client/src/routes/standardUser/UserSettings.js
@@ -261,8 +261,8 @@ const UserSettings = () => {
   const AccountDetails = () => (
     <Box>
       <Typography
-        variant="h5"
-        sx={{ mb: 3, color: "primary.main", fontWeight: 600 }}
+        variant={isMobile ? "h5" : "h4"}
+        sx={{ mb: 3, textAlign: isMobile ? "center" : "left" }}
       >
         Account Details
       </Typography>
@@ -320,6 +320,7 @@ const UserSettings = () => {
               justifyContent: "space-between",
               gap: 1,
               flexWrap: "wrap",
+              flexDirection: isMobile ? "column" : "row",
             }}
           >
             <Button
@@ -327,17 +328,7 @@ const UserSettings = () => {
               color="error"
               disabled={!isUserLoggedIn || deleteBusy}
               onClick={() => setDeleteDialogOpen(true)}
-              sx={{
-                mt: 0,
-                minWidth: "auto",
-                width: "auto",
-                px: { xs: 1.75, sm: 2.25 },
-                py: { xs: "0.45rem", sm: "0.5rem" },
-                fontSize: { xs: "0.82rem", sm: "0.85rem" },
-                lineHeight: 1.2,
-                borderRadius: 1.5,
-                fontWeight: 600,
-              }}
+              sx={{ width: isMobile ? "100%" : "auto" }}
             >
               {deleteBusy ? "Deleting…" : "Delete Account"}
             </Button>
@@ -371,7 +362,6 @@ const UserSettings = () => {
               width: { xs: "min(260px, 100%)", sm: "auto" },
               py: { xs: "0.7rem", sm: "0.6rem" },
               fontSize: { xs: "0.95rem", sm: "0.875rem" },
-              fontWeight: 500,
             }}
           >
             {accountSaving ? "Saving…" : "Save Changes"}
@@ -404,8 +394,8 @@ const UserSettings = () => {
   const Profile = () => (
     <Box>
       <Typography
-        variant="h5"
-        sx={{ mb: 3, color: "primary.main", fontWeight: 600 }}
+        variant={isMobile ? "h5" : "h4"}
+        sx={{ mb: 3, textAlign: isMobile ? "center" : "left" }}
       >
         Profile Settings
       </Typography>
@@ -420,15 +410,6 @@ const UserSettings = () => {
         </Alert>
       )}
 
-      <Box sx={{ mb: 4 }}>
-        <Typography variant="h6">
-          {user?.given_names || ""} {user?.family_name || ""}
-        </Typography>
-        <Typography variant="body2" color="text.secondary">
-          {user?.email || ""}
-        </Typography>
-      </Box>
-
       <Box
         sx={{
           display: "grid",
@@ -523,8 +504,8 @@ const UserSettings = () => {
     return (
       <Box>
         <Typography
-          variant="h5"
-          sx={{ mb: 3, color: "primary.main", fontWeight: 600 }}
+          variant={isMobile ? "h5" : "h4"}
+          sx={{ mb: 3, textAlign: isMobile ? "center" : "left" }}
         >
           Change Password
         </Typography>

From 37bab8874647ff6f8f2f20a94ce5e2c0799529a7 Mon Sep 17 00:00:00 2001
From: Luke Bradley <bralc003@mymail.unisa.edu.au>
Date: Sun, 24 May 2026 12:26:03 +0930
Subject: [PATCH 070/105] Fix mobile layout for report template

---
 client/src/components/AppThemeProvider.jsx        |  4 ++++
 .../src/components/healthReport/ReportTemplate.js | 15 ++++++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/client/src/components/AppThemeProvider.jsx b/client/src/components/AppThemeProvider.jsx
index be1f45f5..ff550784 100644
--- a/client/src/components/AppThemeProvider.jsx
+++ b/client/src/components/AppThemeProvider.jsx
@@ -137,6 +137,10 @@ export const appTheme = createTheme({
           fontWeight: "regular",
           fontFamily: "'Russo One', 'sans-serif'",
         },
+        h6: {
+          fontWeight: "regular",
+          fontFamily: "'Russo One', 'sans-serif'",
+        },
         h7: {
           fontWeight: "regular",
           fontFamily: "'Russo One', 'sans-serif'",
diff --git a/client/src/components/healthReport/ReportTemplate.js b/client/src/components/healthReport/ReportTemplate.js
index c7a7dc2b..8c213cd2 100644
--- a/client/src/components/healthReport/ReportTemplate.js
+++ b/client/src/components/healthReport/ReportTemplate.js
@@ -154,7 +154,9 @@ const ReportTemplate = ({ report, date }) => {
             mx: "auto",
           }}
         >
-          Generated on: {new Date(date).toLocaleDateString("en-AU")}{" at "}{`${new Date(date).toLocaleTimeString("en-AU")}`}
+          Generated on: {new Date(date).toLocaleDateString("en-AU")}
+          {" at "}
+          {`${new Date(date).toLocaleTimeString("en-AU")}`}
         </Typography>
       </Paper>
 
@@ -265,7 +267,7 @@ const ReportTemplate = ({ report, date }) => {
         }}
       >
         <Typography
-          variant={isMobile ? "h5" : "h3"}
+          variant={isMobile ? "h6" : "h3"}
           sx={{
             mx: 2,
             mt: 3,
@@ -281,10 +283,9 @@ const ReportTemplate = ({ report, date }) => {
             p: 2,
           }}
         >
-
           {/* Exercise */}
           <Box>
-            <Typography variant={isMobile ? "h5" : "h4"} sx={{ mb: 1 }}>
+            <Typography variant={isMobile ? "h6" : "h4"} sx={{ mb: 1 }}>
               Exercise Recommendations
             </Typography>
             <Typography variant="body1">
@@ -295,7 +296,7 @@ const ReportTemplate = ({ report, date }) => {
 
           {/* Diet */}
           <Box>
-            <Typography variant={isMobile ? "h5" : "h4"} sx={{ mb: 1 }}>
+            <Typography variant={isMobile ? "h6" : "h4"} sx={{ mb: 1 }}>
               Diet Recommendations
             </Typography>
             <Typography variant="body1">
@@ -305,7 +306,7 @@ const ReportTemplate = ({ report, date }) => {
 
           {/* Lifestyle */}
           <Box>
-            <Typography variant={isMobile ? "h5" : "h4"} sx={{ mb: 1 }}>
+            <Typography variant={isMobile ? "h6" : "h4"} sx={{ mb: 1 }}>
               Lifestyle Recommendations
             </Typography>
             <Typography variant="body1">
@@ -316,7 +317,7 @@ const ReportTemplate = ({ report, date }) => {
 
           {/* Diet to Avoid */}
           <Box>
-            <Typography variant={isMobile ? "h5" : "h4"} sx={{ mb: 1 }}>
+            <Typography variant={isMobile ? "h6" : "h4"} sx={{ mb: 1 }}>
               Diet to Avoid
             </Typography>
             <Typography variant="body1">

From ea8cee2d5e13ae0c07b722440cdab1eb2e493dd9 Mon Sep 17 00:00:00 2001
From: Luke Bradley <bralc003@mymail.unisa.edu.au>
Date: Sun, 24 May 2026 12:35:46 +0930
Subject: [PATCH 071/105] Update mobile UI on Generate Report Form

---
 .../healthReport/GenerateReportForm.js          | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/client/src/components/healthReport/GenerateReportForm.js b/client/src/components/healthReport/GenerateReportForm.js
index 65070815..585739ee 100644
--- a/client/src/components/healthReport/GenerateReportForm.js
+++ b/client/src/components/healthReport/GenerateReportForm.js
@@ -15,6 +15,8 @@ import {
   ListItemText,
   Select,
   FormHelperText,
+  useTheme,
+  useMediaQuery,
 } from "@mui/material";
 import CheckBoxOutlineBlankIcon from "@mui/icons-material/CheckBoxOutlineBlank";
 import CheckBoxIcon from "@mui/icons-material/CheckBox";
@@ -30,6 +32,8 @@ const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
  */
 const GenerateReportForm = () => {
   const navigate = useNavigate();
+  const theme = useTheme();
+  const isMobile = useMediaQuery(theme.breakpoints.down("sm"));
 
   // Options for each drop down input. This can be modified as required to change the input for each selection
   const healthConditions = [
@@ -376,7 +380,7 @@ const GenerateReportForm = () => {
       }}
     >
       <Typography
-        variant="h2"
+        variant={isMobile ? "h4" : "h2"}
         sx={{
           mb: 2,
           mt: 2,
@@ -414,10 +418,11 @@ const GenerateReportForm = () => {
         <Box component="form" onSubmit={handleSubmit}>
           {/* Age & Physique Section */}
           <Typography
-            variant="h4"
+            variant={isMobile ? "h5" : "h4"}
             sx={{
               mb: 2,
               mt: 2,
+              textAlign: isMobile ? "center" : "left",
             }}
           >
             Age & Physique
@@ -490,10 +495,11 @@ const GenerateReportForm = () => {
           </Box>
           {/* Fitness Section */}
           <Typography
-            variant="h4"
+            variant={isMobile ? "h5" : "h4"}
             sx={{
               mb: 2,
               mt: 2,
+              textAlign: isMobile ? "center" : "left",
             }}
           >
             Health & Fitness
@@ -586,10 +592,11 @@ const GenerateReportForm = () => {
             />
           </Box>
           <Typography
-            variant="h4"
+            variant={isMobile ? "h5" : "h4"}
             sx={{
               mb: 2,
               mt: 2,
+              textAlign: isMobile ? "center" : "left",
             }}
           >
             Life Style
@@ -718,7 +725,7 @@ const GenerateReportForm = () => {
             </FormControl>
           </Box>
 
-          <Box sx={{ display: "flex", justifyContent: "end" }}>
+          <Box sx={{ display: "flex", justifyContent: "end", mt: 3 }}>
             <Button
               loading={isLoading}
               variant="contained"

From 04eb783dafdffbc9a1b797c8a5575cb62e1f09b1 Mon Sep 17 00:00:00 2001
From: Luke Bradley <bralc003@mymail.unisa.edu.au>
Date: Sun, 24 May 2026 12:41:24 +0930
Subject: [PATCH 072/105] Update Merchant Report form mobile UI

---
 .../healthReport/BloodReportUpload.js           |  4 ++++
 .../healthReport/MerchantReportForm.js          | 17 +++++++++++++----
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/client/src/components/healthReport/BloodReportUpload.js b/client/src/components/healthReport/BloodReportUpload.js
index cecdfffa..97cfb0fb 100644
--- a/client/src/components/healthReport/BloodReportUpload.js
+++ b/client/src/components/healthReport/BloodReportUpload.js
@@ -73,6 +73,10 @@ const BloodReportUpload = ({ onChange }) => {
       variant="contained"
       tabIndex={-1}
       startIcon={<FileUploadIcon />}
+      sx={{
+        justifyContent: "center",
+        textAlign: "center",
+      }}
     >
       Upload Blood Report
       <HiddenInput type="file" onChange={processBloodReport} />
diff --git a/client/src/components/healthReport/MerchantReportForm.js b/client/src/components/healthReport/MerchantReportForm.js
index 21512891..2ce43707 100644
--- a/client/src/components/healthReport/MerchantReportForm.js
+++ b/client/src/components/healthReport/MerchantReportForm.js
@@ -10,6 +10,8 @@ import {
   TextField,
   Button,
   Autocomplete,
+  useTheme,
+  useMediaQuery,
 } from "@mui/material";
 import OutlinedInput from "@mui/material/OutlinedInput";
 import InputLabel from "@mui/material/InputLabel";
@@ -35,6 +37,10 @@ const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
 const MerchantReportForm = () => {
   const navigate = useNavigate();
   const location = useLocation();
+
+  const theme = useTheme();
+  const isMobile = useMediaQuery(theme.breakpoints.down("sm"));
+
   const pageData = location.state;
   const defaultSelectedPatient =
     pageData && pageData["patientID"] ? pageData["patientID"] : null;
@@ -468,7 +474,7 @@ const MerchantReportForm = () => {
       }}
     >
       <Typography
-        variant="h2"
+        variant={isMobile ? "h4" : "h2"}
         sx={{
           mb: 2,
           mt: 2,
@@ -568,10 +574,11 @@ const MerchantReportForm = () => {
           </Box>
           {/* Age & Physique Section */}
           <Typography
-            variant="h4"
+            variant={isMobile ? "h5" : "h4"}
             sx={{
               mb: 2,
               mt: 2,
+              textAlign: isMobile ? "center" : "left",
             }}
           >
             Age & Physique
@@ -644,10 +651,11 @@ const MerchantReportForm = () => {
           </Box>
           {/* Fitness Section */}
           <Typography
-            variant="h4"
+            variant={isMobile ? "h5" : "h4"}
             sx={{
               mb: 2,
               mt: 2,
+              textAlign: isMobile ? "center" : "left",
             }}
           >
             Health & Fitness
@@ -743,10 +751,11 @@ const MerchantReportForm = () => {
           {/*Multi-select LifeStyle Habits */}
 
           <Typography
-            variant="h4"
+            variant={isMobile ? "h5" : "h4"}
             sx={{
               mb: 2,
               mt: 2,
+              textAlign: isMobile ? "center" : "left",
             }}
           >
             Life Style

From b1b5cf22a1379cd10f84cb42a1e8ded10de3d646 Mon Sep 17 00:00:00 2001
From: birjd002 <birjd002@mymail.unisa.edu.au>
Date: Sun, 24 May 2026 12:54:27 +0930
Subject: [PATCH 073/105] fix: remove boxShadow prop from graph

---
 client/src/components/PDFHealthChart.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/components/PDFHealthChart.js b/client/src/components/PDFHealthChart.js
index bdc3e7c6..9fd2d52b 100644
--- a/client/src/components/PDFHealthChart.js
+++ b/client/src/components/PDFHealthChart.js
@@ -180,7 +180,7 @@ const PDFHealthChart = forwardRef(({ healthData }, ref) => {
         width: 1200,
       }}
     >
-      <Card sx={{ borderRadius: 2, boxShadow: 24, bgcolor: "#ffffff", overflow: "hidden" }}>
+      <Card sx={{ borderRadius: 2, bgcolor: "#ffffff", overflow: "hidden" }}>
         <CardContent sx={{ p: 3, "&:last-child": { pb: 3 } }}>
             <Box
               sx={{

From 5d2924d20b3ccf10d0d2e25868c0017a1feb7bed Mon Sep 17 00:00:00 2001
From: Luke Bradley <bralc003@mymail.unisa.edu.au>
Date: Sun, 24 May 2026 13:01:11 +0930
Subject: [PATCH 074/105] Update patient details page layout

---
 client/src/routes/merchant/PatientDetails.js | 102 ++++++++++---------
 1 file changed, 56 insertions(+), 46 deletions(-)

diff --git a/client/src/routes/merchant/PatientDetails.js b/client/src/routes/merchant/PatientDetails.js
index 4ae741dc..92274be7 100644
--- a/client/src/routes/merchant/PatientDetails.js
+++ b/client/src/routes/merchant/PatientDetails.js
@@ -3,6 +3,7 @@ import {
   Button,
   Card,
   CardContent,
+  Divider,
   Typography,
   useMediaQuery,
   useTheme,
@@ -81,7 +82,7 @@ const PatientDetails = () => {
       >
         <Card sx={{ p: 2 }}>
           <Typography
-            variant="h3"
+            variant={isMobile ? "h4" : "h3"}
             sx={{
               textAlign: "center",
               mb: 2,
@@ -89,97 +90,103 @@ const PatientDetails = () => {
           >
             Patient Details
           </Typography>
-          <hr />
+
           <Box
             sx={{
               display: "grid",
               gridTemplateColumns: { xs: "1fr", sm: "1fr 1fr" },
+              gap: 3,
+              p: 3,
             }}
           >
-            <Typography sx={{ mb: 1 }}>
+            <Typography sx={{ borderBottom: "1px solid #E0E0E0", pb: 1.5 }}>
               <Box
                 component="span"
-                sx={{ color: "primary.main", fontWeight: 600 }}
+                sx={{ color: "#888", textTransform: "uppercase", fontSize: 12 }}
               >
                 Given Name:
-              </Box>
-              {" " + patientData?.patientInfo?.givenNames}
+              </Box>{" "}
+              {patientData?.patientInfo?.givenNames}
             </Typography>
 
-            <Typography sx={{ mb: 1 }}>
+            <Typography sx={{ borderBottom: "1px solid #E0E0E0", pb: 1.5 }}>
               <Box
                 component="span"
-                sx={{ color: "primary.main", fontWeight: 600 }}
+                sx={{ color: "#888", textTransform: "uppercase", fontSize: 12 }}
               >
                 Last Name:
-              </Box>
-              {" " + patientData?.patientInfo?.familyName}
+              </Box>{" "}
+              {patientData?.patientInfo?.familyName}
             </Typography>
 
-            <Typography sx={{ mb: 1 }}>
+            <Typography sx={{ borderBottom: "1px solid #E0E0E0", pb: 1.5 }}>
               <Box
                 component="span"
-                sx={{ color: "primary.main", fontWeight: 600 }}
+                sx={{ color: "#888", textTransform: "uppercase", fontSize: 12 }}
               >
                 Date Of Birth:
-              </Box>
-              {" " + patientData?.patientInfo?.dateOfBirth}
+              </Box>{" "}
+              {patientData?.patientInfo?.dateOfBirth}
             </Typography>
 
-            <Typography sx={{ mb: 1 }}>
+            <Typography sx={{ borderBottom: "1px solid #E0E0E0", pb: 1.5 }}>
               <Box
                 component="span"
-                sx={{ color: "primary.main", fontWeight: 600 }}
+                sx={{ color: "#888", textTransform: "uppercase", fontSize: 12 }}
               >
                 Age:
-              </Box>
-              {" " + patientData?.patientInfo?.age}
+              </Box>{" "}
+              {patientData?.patientInfo?.age}
             </Typography>
 
-            <Typography sx={{ mb: 1 }}>
+            <Typography sx={{ borderBottom: "1px solid #E0E0E0", pb: 1.5 }}>
               <Box
                 component="span"
-                sx={{ color: "primary.main", fontWeight: 600 }}
+                sx={{ color: "#888", textTransform: "uppercase", fontSize: 12 }}
               >
                 Gender:
               </Box>{" "}
               {patientData?.patientInfo?.gender == 1 ? "Male" : "Female"}
             </Typography>
-            <Typography sx={{ mb: 1 }}>
+
+            <Typography sx={{ borderBottom: "1px solid #E0E0E0", pb: 1.5 }}>
               <Box
                 component="span"
-                sx={{ color: "primary.main", fontWeight: 600 }}
+                sx={{ color: "#888", textTransform: "uppercase", fontSize: 12 }}
               >
                 Weight:
-              </Box>
-              {" " + patientData?.patientInfo?.weight} kg
+              </Box>{" "}
+              {patientData?.patientInfo?.weight} kg
             </Typography>
-            <Typography sx={{ mb: 1 }}>
+
+            <Typography sx={{ borderBottom: "1px solid #E0E0E0", pb: 1.5 }}>
               <Box
                 component="span"
-                sx={{ color: "primary.main", fontWeight: 600 }}
+                sx={{ color: "#888", textTransform: "uppercase", fontSize: 12 }}
               >
                 Height:
-              </Box>
-              {" " + patientData?.patientInfo?.height} cm
+              </Box>{" "}
+              {patientData?.patientInfo?.height} cm
             </Typography>
           </Box>
-          <hr />
-          <Typography variant="h5" sx={{ mb: 1 }}>
-            It has been {patientData?.days} days since{" "}
-            {patientData?.patientInfo?.givenNames}'s last health report
-          </Typography>
+          <Divider sx={{ borderColor: "#E0E0E0" }} />
+          <Box sx={{ ml: 2 }}>
+            <Typography variant={isMobile ? "h6" : "h5"} sx={{ mt: 2 }}>
+              It has been {patientData?.days} days since{" "}
+              {patientData?.patientInfo?.givenNames}'s last health report
+            </Typography>
 
-          <Button
-            variant="contained"
-            onClick={(e) =>
-              navigate("/merchant-generate-report", {
-                state: { patientID: patientID },
-              })
-            }
-          >
-            Generate Report
-          </Button>
+            <Button
+              variant="contained"
+              onClick={(e) =>
+                navigate("/merchant-generate-report", {
+                  state: { patientID: patientID },
+                })
+              }
+            >
+              Generate Report
+            </Button>
+          </Box>
         </Card>
       </Box>
 
@@ -206,7 +213,7 @@ const PatientDetails = () => {
             sx={{
               display: "flex",
               gap: { xs: 1, sm: 2 },
-              flexDirection: "row",
+              flexDirection: isMobile ? "column" : "row",
             }}
           >
             {["stroke", "diabetes", "cvd"].map((key) => (
@@ -299,7 +306,7 @@ const PatientDetails = () => {
               height: { xs: "auto", md: "95%" },
             }}
           >
-            <Typography variant="h5" sx={{ mb: 2 }}>
+            <Typography variant={isMobile ? "h6" : "h5"} sx={{ mb: 2 }}>
               Latest Recommendations
             </Typography>
             <Box>
@@ -317,7 +324,10 @@ const PatientDetails = () => {
                             : "none",
                       }}
                     >
-                      <Typography variant="h6" sx={{ mb: 1 }}>
+                      <Typography
+                        variant={isMobile ? "h7" : "h6"}
+                        sx={{ mb: 1 }}
+                      >
                         {key.toUpperCase()}
                       </Typography>
                       <Typography sx={{ whiteSpace: "pre-line" }}>

From efe375a6b1d6a9cf7828bf03523b139ca9db2772 Mon Sep 17 00:00:00 2001
From: Luke Bradley <bralc003@mymail.unisa.edu.au>
Date: Sun, 24 May 2026 13:06:28 +0930
Subject: [PATCH 075/105] Fix mobile font size on Merchant landing

---
 client/src/routes/merchant/MerchantLanding.js | 26 ++++++++++++++++---
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/client/src/routes/merchant/MerchantLanding.js b/client/src/routes/merchant/MerchantLanding.js
index dd420d4a..1d53f170 100644
--- a/client/src/routes/merchant/MerchantLanding.js
+++ b/client/src/routes/merchant/MerchantLanding.js
@@ -1,4 +1,11 @@
-import { Box, Card, CardContent, Typography } from "@mui/material";
+import {
+  Box,
+  Card,
+  CardContent,
+  Typography,
+  useMediaQuery,
+  useTheme,
+} from "@mui/material";
 import { useEffect, useState } from "react";
 
 const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
@@ -14,6 +21,9 @@ const MerchantLanding = () => {
   const [data, setData] = useState({});
   const [name, setName] = useState("");
 
+  const theme = useTheme();
+  const isMobile = useMediaQuery(theme.breakpoints.down("sm"));
+
   useEffect(() => {
     fetch(`${API_BASE}/user/me`, {
       method: "GET",
@@ -76,7 +86,9 @@ const MerchantLanding = () => {
       }}
     >
       <Box sx={{ borderBottom: "1px solid #d6d6d6", mb: 4, py: 3 }}>
-        <Typography variant="h2">Patient Overview</Typography>
+        <Typography variant={isMobile ? "h4" : "h2"}>
+          Patient Overview
+        </Typography>
       </Box>
 
       {/* Stat cards */}
@@ -114,7 +126,10 @@ const MerchantLanding = () => {
       >
         {/* Condition risk graph */}
         <Card sx={{ flex: 1, borderRadius: "10px", p: 2 }}>
-          <Typography variant="h4" sx={{ mb: 2 }}>
+          <Typography
+            variant={isMobile ? "h5" : "h4"}
+            sx={{ mb: 2, textAlign: isMobile ? "center" : "left" }}
+          >
             Risk Distribution
           </Typography>
           {["stroke", "cvd", "diabetes"].map((condition) => {
@@ -193,7 +208,10 @@ const MerchantLanding = () => {
             p: 2,
           }}
         >
-          <Typography variant="h4" sx={{ mb: 2 }}>
+          <Typography
+            variant={isMobile ? "h5" : "h4"}
+            sx={{ mb: 2, textAlign: isMobile ? "center" : "left" }}
+          >
             Report Activity
           </Typography>
           <Box sx={{ maxHeight: 380, overflowY: "auto" }}>

From 2478d740cec6525cf0bc077abaef24a6411462d7 Mon Sep 17 00:00:00 2001
From: Luke Bradley <bralc003@mymail.unisa.edu.au>
Date: Sun, 24 May 2026 13:08:17 +0930
Subject: [PATCH 076/105] Fix mobile font size in Patient Management

---
 client/src/routes/merchant/PatientManagement.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/client/src/routes/merchant/PatientManagement.js b/client/src/routes/merchant/PatientManagement.js
index 48c03332..6826f280 100644
--- a/client/src/routes/merchant/PatientManagement.js
+++ b/client/src/routes/merchant/PatientManagement.js
@@ -8,6 +8,8 @@ import {
   Stack,
   TextField,
   Typography,
+  useMediaQuery,
+  useTheme,
 } from "@mui/material";
 import InputAdornment from "@mui/material/InputAdornment";
 import { DataGrid } from "@mui/x-data-grid";
@@ -30,6 +32,9 @@ const PatientManagement = () => {
   const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
   const navigate = useNavigate();
 
+  const theme = useTheme();
+  const isMobile = useMediaQuery(theme.breakpoints.down("sm"));
+
   const [patientData, setPatientData] = useState([]);
   const [paginationModel, setPaginationModel] = useState({
     page: 0,
@@ -198,10 +203,7 @@ const PatientManagement = () => {
         }}
       >
         <Stack spacing={1} sx={{ width: "100%", mb: 3 }}>
-          <Typography
-            variant="h3"
-            sx={{ fontSize: { xs: "2em", sm: "2em", md: "3em" } }}
-          >
+          <Typography variant={isMobile ? "h5" : "h3"}>
             Patient Management
           </Typography>
           <Divider />

From 4c2718200d6000be121a53be7f5137833f7e69e8 Mon Sep 17 00:00:00 2001
From: birjd002 <birjd002@mymail.unisa.edu.au>
Date: Sun, 24 May 2026 13:11:51 +0930
Subject: [PATCH 077/105] fix: resolve merge conflicts with dev

---
 client/src/components/{ => healthReport}/PDFHealthChart.js | 0
 client/src/routes/standardUser/ReportHistory.js            | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename client/src/components/{ => healthReport}/PDFHealthChart.js (100%)

diff --git a/client/src/components/PDFHealthChart.js b/client/src/components/healthReport/PDFHealthChart.js
similarity index 100%
rename from client/src/components/PDFHealthChart.js
rename to client/src/components/healthReport/PDFHealthChart.js
diff --git a/client/src/routes/standardUser/ReportHistory.js b/client/src/routes/standardUser/ReportHistory.js
index 6bf469bf..fcbd1761 100644
--- a/client/src/routes/standardUser/ReportHistory.js
+++ b/client/src/routes/standardUser/ReportHistory.js
@@ -8,7 +8,7 @@ import Stack from "@mui/material/Stack";
 import React, { useState, useEffect, useRef } from "react";
 import KeyboardArrowDownIcon from "@mui/icons-material/KeyboardArrowDown";
 import KeyboardArrowUpIcon from "@mui/icons-material/KeyboardArrowUp";
-import PDFHealthChart from "../components/PDFHealthChart";
+import PDFHealthChart from "../components/healthReport/PDFHealthChart";
 
 import {
   Box,

From 87cd72cf53bab6df274d682fc393b730ce1cb899 Mon Sep 17 00:00:00 2001
From: Luke Bradley <bralc003@mymail.unisa.edu.au>
Date: Sun, 24 May 2026 13:14:19 +0930
Subject: [PATCH 078/105] Update mobile layout on UserLanding

---
 client/src/routes/standardUser/UserLanding.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/client/src/routes/standardUser/UserLanding.js b/client/src/routes/standardUser/UserLanding.js
index 35e7cb02..7ed131b9 100644
--- a/client/src/routes/standardUser/UserLanding.js
+++ b/client/src/routes/standardUser/UserLanding.js
@@ -118,7 +118,7 @@ const UserLanding = ({}) => {
       <Box
         sx={{
           display: "flex",
-          flexDirection: { xs: "column", md: "row" },
+          flexDirection: isMobile ? "column" : "row",
           gap: 3,
         }}
       >
@@ -137,7 +137,7 @@ const UserLanding = ({}) => {
             sx={{
               display: "flex",
               gap: { xs: 1, sm: 2 },
-              flexDirection: "row",
+              flexDirection: isMobile ? "column" : "row",
             }}
           >
             {["stroke", "diabetes", "cvd"].map((key) => (
@@ -228,7 +228,7 @@ const UserLanding = ({}) => {
               height: { xs: "auto", md: "95%" },
             }}
           >
-            <Typography variant="h5" sx={{ mb: 2 }}>
+            <Typography variant={isMobile ? "h6" : "h5"} sx={{ mb: 2 }}>
               Latest Recommendations
             </Typography>
             <Box>
@@ -246,7 +246,10 @@ const UserLanding = ({}) => {
                             : "none",
                       }}
                     >
-                      <Typography variant="h6" sx={{ mb: 1 }}>
+                      <Typography
+                        variant={isMobile ? "h7" : "h6"}
+                        sx={{ mb: 1 }}
+                      >
                         {key.toUpperCase()}
                       </Typography>
                       <Typography sx={{ whiteSpace: "pre-line" }}>

From d2ba52ca3d0ab56f6b1ddbe41565d08714dee498 Mon Sep 17 00:00:00 2001
From: birjd002 <birjd002@mymail.unisa.edu.au>
Date: Sun, 24 May 2026 13:16:05 +0930
Subject: [PATCH 079/105] fix: update relative path of imports

---
 client/src/routes/merchant/MerchantReports.js   | 2 +-
 client/src/routes/standardUser/ReportHistory.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/routes/merchant/MerchantReports.js b/client/src/routes/merchant/MerchantReports.js
index 655b7ed8..8f4a19fa 100644
--- a/client/src/routes/merchant/MerchantReports.js
+++ b/client/src/routes/merchant/MerchantReports.js
@@ -5,7 +5,7 @@ import IconButton from "@mui/material/IconButton";
 import KeyboardArrowDownIcon from "@mui/icons-material/KeyboardArrowDown";
 import KeyboardArrowUpIcon from "@mui/icons-material/KeyboardArrowUp";
 import ConfirmationDialog from "../../components/dialog/confirmationDialog";
-import PDFHealthChart from "../components/healthReport/PDFHealthChart";
+import PDFHealthChart from "../../components/healthReport/PDFHealthChart";
 import React, { useState, useEffect, useRef } from "react";
 import { useLocation } from "react-router-dom";
 import {
diff --git a/client/src/routes/standardUser/ReportHistory.js b/client/src/routes/standardUser/ReportHistory.js
index fcbd1761..43cc8911 100644
--- a/client/src/routes/standardUser/ReportHistory.js
+++ b/client/src/routes/standardUser/ReportHistory.js
@@ -8,7 +8,7 @@ import Stack from "@mui/material/Stack";
 import React, { useState, useEffect, useRef } from "react";
 import KeyboardArrowDownIcon from "@mui/icons-material/KeyboardArrowDown";
 import KeyboardArrowUpIcon from "@mui/icons-material/KeyboardArrowUp";
-import PDFHealthChart from "../components/healthReport/PDFHealthChart";
+import PDFHealthChart from "../../components/healthReport/PDFHealthChart";
 
 import {
   Box,

From 610726d1e7b294abf3fb1463cff12dcef581aad9 Mon Sep 17 00:00:00 2001
From: Luke Bradley <bralc003@mymail.unisa.edu.au>
Date: Sun, 24 May 2026 13:22:15 +0930
Subject: [PATCH 080/105] Update no report screen on report history

---
 .../src/routes/standardUser/ReportHistory.js  | 36 +++++++++++++++----
 1 file changed, 30 insertions(+), 6 deletions(-)

diff --git a/client/src/routes/standardUser/ReportHistory.js b/client/src/routes/standardUser/ReportHistory.js
index 88faae0b..b74c6c0e 100644
--- a/client/src/routes/standardUser/ReportHistory.js
+++ b/client/src/routes/standardUser/ReportHistory.js
@@ -4,6 +4,7 @@ import { useEffect, useState } from "react";
 import ConfirmationDialog from "../../components/dialog/confirmationDialog";
 import DownloadReportButton from "../../components/healthReport/DownloadReportButton";
 import ReportTemplate from "../../components/healthReport/ReportTemplate";
+import { Link as RouterLink } from "react-router-dom";
 
 import {
   Box,
@@ -144,15 +145,38 @@ const AIHealthPrediction = ({}) => {
       <Box
         sx={{
           minHeight: "100vh",
-          display: "flex",
-          alignItems: "center",
-          justifyContent: "center",
           bgcolor: "background.default",
+          ml: "65px",
+          mt: "80px",
         }}
       >
-        <Typography variant="h5" sx={{ color: "text.secondary" }}>
-          No Health Prediction Reports Available
-        </Typography>
+        <Box
+          sx={{
+            minHeight: "100vh",
+            display: "flex",
+            alignItems: "center",
+            justifyContent: "center",
+            bgcolor: "background.default",
+            flexDirection: "column",
+          }}
+        >
+          <Typography variant="h5" sx={{ color: "text.secondary" }}>
+            No Health Prediction Reports Available
+          </Typography>
+          <Button
+            variant="contained"
+            component={RouterLink}
+            to="/generate-report"
+            sx={{
+              width: isMobile ? "100%" : "auto",
+              py: { xs: "0.8rem", sm: "0.6rem" },
+              fontSize: { xs: "1rem", sm: "0.875rem" },
+              fontWeight: 500,
+            }}
+          >
+            Generate Report
+          </Button>
+        </Box>
       </Box>
     );
   } else {

From f7a1560b58a7cd71e401b0edea41111cee2880ea Mon Sep 17 00:00:00 2001
From: Luke Bradley <bralc003@mymail.unisa.edu.au>
Date: Sun, 24 May 2026 14:10:22 +0930
Subject: [PATCH 081/105] Fix mobile button alignment

---
 .../administrator/analytics/AverageRiskSeriesAnalytics.js  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/client/src/components/administrator/analytics/AverageRiskSeriesAnalytics.js b/client/src/components/administrator/analytics/AverageRiskSeriesAnalytics.js
index d31c06f4..d631fa19 100644
--- a/client/src/components/administrator/analytics/AverageRiskSeriesAnalytics.js
+++ b/client/src/components/administrator/analytics/AverageRiskSeriesAnalytics.js
@@ -7,6 +7,8 @@ import {
   MenuItem,
   Select,
   Typography,
+  useMediaQuery,
+  useTheme,
 } from "@mui/material";
 import Divider from "@mui/material/Divider";
 import { LineChart } from "@mui/x-charts/LineChart";
@@ -23,6 +25,9 @@ const DEFAULT_YEAR = 2026;
  * @returns {@mui.material.Card}
  */
 const AverageRiskSeriesAnalytics = () => {
+  const theme = useTheme();
+  const isMobile = useMediaQuery(theme.breakpoints.down("sm"));
+
   const [availableYears, setAvailableYears] = useState([]);
   const [year, setYear] = useState("");
   const [xAxisData, setXAxisData] = useState([]);
@@ -96,7 +101,7 @@ const AverageRiskSeriesAnalytics = () => {
               Average Disease Risk (%)
             </Typography>
           </Grid>
-          <Grid size={2}>
+          <Grid size={isMobile ? 12 : 2}>
             <FormControl>
               <InputLabel id="year-label-id">Year</InputLabel>
               <Select

From 816d4ddb966dccf31c6e2c76bd37ca49c14ee50f Mon Sep 17 00:00:00 2001
From: Luke Bradley <bralc003@mymail.unisa.edu.au>
Date: Sun, 24 May 2026 14:40:51 +0930
Subject: [PATCH 082/105] Remove unused variables and imports after
 modifications

---
 client/src/components/AppThemeProvider.jsx    |  5 +-
 client/src/components/Navbar.js               | 53 +++++-----------
 .../administrator/AccountApprovalTable.js     |  2 +-
 .../analytics/AverageRiskSeriesAnalytics.js   |  5 --
 .../authentication/PhoneInputField.js         | 16 +----
 .../healthReport/GenerateReportForm.js        | 54 ++++------------
 .../healthReport/MerchantReportForm.js        | 63 +++++--------------
 .../components/healthReport/ReportTemplate.js |  8 +--
 .../patientAccessRequest/AcceptRequestForm.js | 13 ++--
 .../RequestPatientAccessForm.js               |  9 ++-
 client/src/index.js                           |  2 +-
 .../routes/admin/AdministratorDashboard.js    |  2 -
 .../routes/merchant/MerchantGenerateReport.js |  5 +-
 client/src/routes/merchant/MerchantLanding.js | 20 ------
 client/src/routes/merchant/MerchantReports.js | 10 +--
 client/src/routes/merchant/PatientDetails.js  |  2 +-
 .../src/routes/merchant/PatientManagement.js  |  4 --
 .../routes/standardUser/HealthAnalytics.js    |  1 -
 .../src/routes/standardUser/ReportHistory.js  | 12 +---
 client/src/routes/standardUser/UserLanding.js |  4 +-
 client/src/utils/PublicOnlyRoutes.js          |  1 -
 21 files changed, 68 insertions(+), 223 deletions(-)

diff --git a/client/src/components/AppThemeProvider.jsx b/client/src/components/AppThemeProvider.jsx
index ff550784..f14dacc8 100644
--- a/client/src/components/AppThemeProvider.jsx
+++ b/client/src/components/AppThemeProvider.jsx
@@ -1,7 +1,5 @@
-import React from "react";
-import { ThemeProvider, createTheme } from "@mui/material";
 import "@fontsource/russo-one";
-import { color, fontWeight } from "@mui/system";
+import { ThemeProvider, createTheme } from "@mui/material";
 
 /**
  * A centralized MUI theme for the web app.
@@ -154,7 +152,6 @@ export const appTheme = createTheme({
         disableRowSelectionOnClick: true,
         autoHeight: false,
         density: "standard",
-        autoHeight: false,
       },
       styleOverrides: {
         root: {
diff --git a/client/src/components/Navbar.js b/client/src/components/Navbar.js
index 8a9d3eb4..e1015f55 100644
--- a/client/src/components/Navbar.js
+++ b/client/src/components/Navbar.js
@@ -1,40 +1,35 @@
-import AppBar from "@mui/material/AppBar";
-import Box from "@mui/material/Box";
-import Toolbar from "@mui/material/Toolbar";
-import Typography from "@mui/material/Typography";
-import Button from "@mui/material/Button";
-import Menu from "@mui/material/Menu";
-import { useNavigate, useLocation } from "react-router-dom";
-import MenuItem from "@mui/material/MenuItem";
-import { useContext, useState } from "react";
-import logo from "../assets/WellAiLogoTR.png";
 import {
+  Backdrop,
   Drawer,
+  IconButton,
   List,
   ListItemButton,
-  IconButton,
   Tooltip,
-  ClickAwayListener,
-  Backdrop,
 } from "@mui/material";
+import AppBar from "@mui/material/AppBar";
+import Box from "@mui/material/Box";
+import Toolbar from "@mui/material/Toolbar";
+import Typography from "@mui/material/Typography";
+import { useContext, useState } from "react";
+import { useLocation, useNavigate } from "react-router-dom";
+import logo from "../assets/WellAiLogoTR.png";
 import { UserContext } from "../utils/UserContext";
-import PrivacyNotice from "./dialog/PrivacyNotice";
 import DisclaimerPolicy from "./dialog/DisclaimerPolicy";
+import PrivacyNotice from "./dialog/PrivacyNotice";
 
 // Icons
-import AccountCircleIcon from "@mui/icons-material/AccountCircle";
+import ChevronLeftIcon from "@mui/icons-material/ChevronLeft";
 import DashboardIcon from "@mui/icons-material/Dashboard";
-import RestorePageIcon from "@mui/icons-material/RestorePage";
-import TimelineIcon from "@mui/icons-material/Timeline";
-import HistoryIcon from "@mui/icons-material/History";
-import SettingsIcon from "@mui/icons-material/Settings";
-import LogoutIcon from "@mui/icons-material/Logout";
+import FileCopyIcon from "@mui/icons-material/FileCopy";
 import GroupIcon from "@mui/icons-material/Group";
+import HistoryIcon from "@mui/icons-material/History";
 import HowToRegIcon from "@mui/icons-material/HowToReg";
-import FileCopyIcon from "@mui/icons-material/FileCopy";
+import LogoutIcon from "@mui/icons-material/Logout";
 import ManageAccountsIcon from "@mui/icons-material/ManageAccounts";
 import MenuIcon from "@mui/icons-material/Menu";
-import ChevronLeftIcon from "@mui/icons-material/ChevronLeft";
+import RestorePageIcon from "@mui/icons-material/RestorePage";
+import SettingsIcon from "@mui/icons-material/Settings";
+import TimelineIcon from "@mui/icons-material/Timeline";
 
 const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
 
@@ -115,9 +110,6 @@ const NavBar = ({ role }) => {
     { icon: <LogoutIcon sx={{ color: "#ff4f4f" }} />, title: "Logout" },
   ];
 
-  // Check if settings menu is open
-  const [openMenu, setOpenMenu] = useState(null);
-
   // User Logout
   async function logout() {
     await fetch(`${API_BASE}/logout`, {
@@ -169,11 +161,9 @@ const NavBar = ({ role }) => {
       navigate("/health-analytics");
     }
     if (page === "Settings") {
-      handleCloseSettings();
       navigate("/user-settings");
     }
     if (page === "Logout") {
-      handleCloseSettings();
       logout();
     }
     if (page === "Users") {
@@ -196,15 +186,6 @@ const NavBar = ({ role }) => {
     }
   }
 
-  function handleOpenSettings(e) {
-    setOpenMenu(e.currentTarget);
-    console.log(openMenu);
-  }
-
-  function handleCloseSettings() {
-    setOpenMenu(null);
-  }
-
   // Navigation Bar for standard user type
   if (role === "standard_user")
     return (
diff --git a/client/src/components/administrator/AccountApprovalTable.js b/client/src/components/administrator/AccountApprovalTable.js
index efc4df2b..92d97590 100644
--- a/client/src/components/administrator/AccountApprovalTable.js
+++ b/client/src/components/administrator/AccountApprovalTable.js
@@ -10,7 +10,7 @@ const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
  *
  * @returns {@mui.material.Box}
  */
-const AccountApprovalTable = ({}) => {
+const AccountApprovalTable = () => {
   const [userData, setUserData] = useState([]); // Stores user data
   const [selectedUser, setselectedUser] = useState(); // Stores the selected user
   const [dialogOpen, setDialogOpen] = useState(false); // Stores dialog state
diff --git a/client/src/components/administrator/analytics/AverageRiskSeriesAnalytics.js b/client/src/components/administrator/analytics/AverageRiskSeriesAnalytics.js
index d631fa19..f5810a31 100644
--- a/client/src/components/administrator/analytics/AverageRiskSeriesAnalytics.js
+++ b/client/src/components/administrator/analytics/AverageRiskSeriesAnalytics.js
@@ -16,7 +16,6 @@ import dayjs from "dayjs";
 import { useEffect, useState } from "react";
 
 const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
-const DEFAULT_YEAR = 2026;
 
 /**
  * A card that displays the average progression for stroke, diabetes,
@@ -75,10 +74,6 @@ const AverageRiskSeriesAnalytics = () => {
       });
   }, [year]);
 
-  function extractXAxisData(rawData) {
-    return rawData.map((d) => new Date(d.date));
-  }
-
   return (
     <Card sx={{ p: "5px" }}>
       <CardContent>
diff --git a/client/src/components/authentication/PhoneInputField.js b/client/src/components/authentication/PhoneInputField.js
index 4a9e051d..b2fb7601 100644
--- a/client/src/components/authentication/PhoneInputField.js
+++ b/client/src/components/authentication/PhoneInputField.js
@@ -1,4 +1,4 @@
-import { Autocomplete, Box, FormControl, Grid, TextField } from "@mui/material";
+import { Autocomplete, Box, FormControl, TextField } from "@mui/material";
 import {
   getCountries,
   getCountryCallingCode,
@@ -46,20 +46,6 @@ const PhoneInputField = ({ onChange, value }) => {
       .sort((a, b) => a - b);
   }
 
-  /**
-   * Creates an array containing all unique dialing codes.
-   * @returns Array of possible dialing codes.
-   */
-  function getUniqueDialingCodes() {
-    return Array.from(
-      new Set(
-        getCountries()
-          .map((country) => getCountryCallingCode(country))
-          .sort((a, b) => a - b),
-      ),
-    );
-  }
-
   function updateDialingCode(_, value) {
     if (value !== null) {
       value = value.code;
diff --git a/client/src/components/healthReport/GenerateReportForm.js b/client/src/components/healthReport/GenerateReportForm.js
index 585739ee..1616864c 100644
--- a/client/src/components/healthReport/GenerateReportForm.js
+++ b/client/src/components/healthReport/GenerateReportForm.js
@@ -1,25 +1,24 @@
-import { useState, useEffect } from "react";
-import { useNavigate } from "react-router-dom";
+import CheckBoxIcon from "@mui/icons-material/CheckBox";
+import CheckBoxOutlineBlankIcon from "@mui/icons-material/CheckBoxOutlineBlank";
 import {
-  Card,
-  CardHeader,
-  CardContent,
   Box,
-  Typography,
-  TextField,
   Button,
+  Card,
+  CardContent,
+  FormControl,
+  FormHelperText,
   InputLabel,
+  ListItemText,
   MenuItem,
   OutlinedInput,
-  FormControl,
-  ListItemText,
   Select,
-  FormHelperText,
-  useTheme,
+  TextField,
+  Typography,
   useMediaQuery,
+  useTheme,
 } from "@mui/material";
-import CheckBoxOutlineBlankIcon from "@mui/icons-material/CheckBoxOutlineBlank";
-import CheckBoxIcon from "@mui/icons-material/CheckBox";
+import { useEffect, useState } from "react";
+import { useNavigate } from "react-router-dom";
 import BloodReportUpload from "./BloodReportUpload";
 
 const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
@@ -72,7 +71,6 @@ const GenerateReportForm = () => {
   };
 
   const [condition, setCondition] = useState([]);
-  const [lifeStyle, setLifeStyle] = useState([]);
 
   const [weight, setWeight] = useState(null);
   const [alertWeightRequired, setAlertWeightRequired] = useState(false);
@@ -138,32 +136,6 @@ const GenerateReportForm = () => {
     setCondition(typeof value === "string" ? value.split(",") : value);
   }
 
-  function handleChangeLifeStyle(e) {
-    const {
-      target: { value },
-    } = e;
-
-    let newValues = typeof value === "string" ? value.split(",") : value;
-    const lastSelected = newValues[newValues.length - 1];
-
-    // Remove former smoker if the user selects they are a current smoker
-    if (
-      lastSelected === "Current Smoker" &&
-      newValues.includes("Former Smoker")
-    ) {
-      newValues = newValues.filter((smoker) => smoker !== "Former Smoker");
-    }
-
-    // Remove current smoker if the user selects they are a former smoker
-    if (
-      lastSelected === "Former Smoker" &&
-      newValues.includes("Current Smoker")
-    ) {
-      newValues = newValues.filter((smoker) => smoker !== "Current Smoker");
-    }
-    setLifeStyle(newValues);
-  }
-
   function updateAge(e) {
     const ageValue = Number(e.target.value);
     const isAgeValid =
@@ -286,7 +258,7 @@ const GenerateReportForm = () => {
 
   // Fills in fields with information found in the blood reports.
   async function readBloodReport(e) {
-    if (e.aveBloodGlucose !== NaN) {
+    if (!isNaN(e.aveBloodGlucose)) {
       // Value needs to be in a specific dictionary format to be validated and set.
       updateBloodGlucose({ target: { value: e.aveBloodGlucose.toString() } });
     }
diff --git a/client/src/components/healthReport/MerchantReportForm.js b/client/src/components/healthReport/MerchantReportForm.js
index 2ce43707..52786d87 100644
--- a/client/src/components/healthReport/MerchantReportForm.js
+++ b/client/src/components/healthReport/MerchantReportForm.js
@@ -1,29 +1,28 @@
-import React, { useState, useEffect } from "react";
+import { useEffect, useState } from "react";
 
-import { useNavigate, useLocation } from "react-router-dom";
+import CheckBoxIcon from "@mui/icons-material/CheckBox";
+import CheckBoxOutlineBlankIcon from "@mui/icons-material/CheckBoxOutlineBlank";
+import FileUploadIcon from "@mui/icons-material/FileUpload";
 import {
+  Autocomplete,
+  Box,
+  Button,
   Card,
-  CardHeader,
   CardContent,
-  Box,
-  Typography,
   TextField,
-  Button,
-  Autocomplete,
-  useTheme,
+  Typography,
   useMediaQuery,
+  useTheme,
 } from "@mui/material";
-import OutlinedInput from "@mui/material/OutlinedInput";
-import InputLabel from "@mui/material/InputLabel";
-import MenuItem from "@mui/material/MenuItem";
 import FormControl from "@mui/material/FormControl";
+import FormHelperText from "@mui/material/FormHelperText";
+import InputLabel from "@mui/material/InputLabel";
 import ListItemText from "@mui/material/ListItemText";
+import MenuItem from "@mui/material/MenuItem";
+import OutlinedInput from "@mui/material/OutlinedInput";
 import Select from "@mui/material/Select";
-import CheckBoxOutlineBlankIcon from "@mui/icons-material/CheckBoxOutlineBlank";
-import CheckBoxIcon from "@mui/icons-material/CheckBox";
-import FormHelperText from "@mui/material/FormHelperText";
-import FileUploadIcon from "@mui/icons-material/FileUpload";
 import { styled } from "@mui/material/styles";
+import { useLocation, useNavigate } from "react-router-dom";
 import BloodReportUpload from "./BloodReportUpload";
 
 const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
@@ -59,9 +58,8 @@ const MerchantReportForm = () => {
     "High Cholesterol",
     "Stroke",
   ];
-  // List of lifestyle choices
-  const lifeStyleChoices = ["Drink Alcohol", "Current Smoker", "Former Smoker"];
 
+  // List of lifestyle choices
   const smokerOptions = ["No", "Yes", "Former smoker"];
 
   const maritalStatusOptions = ["Single", "Married", "Widow", "Divorced"];
@@ -89,7 +87,6 @@ const MerchantReportForm = () => {
   };
   // List variables from multiselect lists
   const [condition, setCondition] = useState([]);
-  const [lifeStyle, setLifeStyle] = useState([]);
 
   // Form Variables and alerts for input validation
   const [weight, setWeight] = useState(null);
@@ -136,7 +133,7 @@ const MerchantReportForm = () => {
         setPatientList(data);
         if (defaultSelectedPatient) {
           const name = data.find(
-            (item) => item.patientId == defaultSelectedPatient,
+            (item) => item.patientId === defaultSelectedPatient,
           );
           setPatientName(name.name);
         }
@@ -182,32 +179,6 @@ const MerchantReportForm = () => {
     fetchPatientData();
   }, [selectedPatient]);
 
-  function handleChangeLifeStyle(e) {
-    const {
-      target: { value },
-    } = e;
-
-    let newValues = typeof value === "string" ? value.split(",") : value;
-    const lastSelected = newValues[newValues.length - 1];
-
-    // Remove former smoker if the user selects they are a current smoker
-    if (
-      lastSelected === "Current Smoker" &&
-      newValues.includes("Former Smoker")
-    ) {
-      newValues = newValues.filter((smoker) => smoker !== "Former Smoker");
-    }
-
-    // Remove current smoker if the user selects they are a former smoker
-    if (
-      lastSelected === "Former Smoker" &&
-      newValues.includes("Current Smoker")
-    ) {
-      newValues = newValues.filter((smoker) => smoker !== "Current Smoker");
-    }
-    setLifeStyle(newValues);
-  }
-
   function updateAge(e) {
     const ageValue = Number(e.target.value);
     const isAgeValid =
@@ -338,7 +309,7 @@ const MerchantReportForm = () => {
 
   // Fills in fields with information found in the blood reports.
   async function readBloodReport(e) {
-    if (e.aveBloodGlucose !== NaN) {
+    if (!isNaN(e.aveBloodGlucose)) {
       // Value needs to be in a specific dictionary format to be validated and set.
       updateBloodGlucose({ target: { value: e.aveBloodGlucose.toString() } });
     }
diff --git a/client/src/components/healthReport/ReportTemplate.js b/client/src/components/healthReport/ReportTemplate.js
index 8c213cd2..45e397b6 100644
--- a/client/src/components/healthReport/ReportTemplate.js
+++ b/client/src/components/healthReport/ReportTemplate.js
@@ -1,14 +1,10 @@
 import {
   Box,
-  Typography,
-  List,
-  ListItem,
-  ListItemText,
-  Divider,
   Card,
   Paper,
-  useTheme,
+  Typography,
   useMediaQuery,
+  useTheme,
 } from "@mui/material";
 
 /**
diff --git a/client/src/components/patientAccessRequest/AcceptRequestForm.js b/client/src/components/patientAccessRequest/AcceptRequestForm.js
index 84cc0337..965bee90 100644
--- a/client/src/components/patientAccessRequest/AcceptRequestForm.js
+++ b/client/src/components/patientAccessRequest/AcceptRequestForm.js
@@ -1,17 +1,16 @@
-import { useState, useEffect } from "react";
-import { useParams, Link as RouterLink } from "react-router-dom";
 import {
   Box,
-  Container,
-  Stack,
   Button,
-  Typography,
-  Link,
+  Container,
+  Divider,
   List,
   ListItem,
   ListItemText,
-  Divider,
+  Stack,
+  Typography,
 } from "@mui/material";
+import { useState } from "react";
+import { Link as RouterLink, useParams } from "react-router-dom";
 
 const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
 
diff --git a/client/src/components/patientAccessRequest/RequestPatientAccessForm.js b/client/src/components/patientAccessRequest/RequestPatientAccessForm.js
index 8c8e2dc0..71a4d349 100644
--- a/client/src/components/patientAccessRequest/RequestPatientAccessForm.js
+++ b/client/src/components/patientAccessRequest/RequestPatientAccessForm.js
@@ -1,14 +1,13 @@
-import { useState } from "react";
-import { Link as RouterLink } from "react-router-dom";
 import {
   Box,
+  Button,
   Container,
+  Divider,
   Stack,
-  Button,
   Typography,
-  Link,
-  Divider,
 } from "@mui/material";
+import { useState } from "react";
+import { Link as RouterLink } from "react-router-dom";
 import EmailInputField from "../authentication/EmailInputField";
 
 const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
diff --git a/client/src/index.js b/client/src/index.js
index f3f78875..c4084df1 100644
--- a/client/src/index.js
+++ b/client/src/index.js
@@ -1,7 +1,7 @@
 import React from "react";
 import ReactDOM from "react-dom/client";
 import "./index.css";
-import App from "./App";
+
 import reportWebVitals from "./reportWebVitals";
 import { BrowserRouter, Routes, Route } from "react-router-dom";
 
diff --git a/client/src/routes/admin/AdministratorDashboard.js b/client/src/routes/admin/AdministratorDashboard.js
index 913569fe..28314012 100644
--- a/client/src/routes/admin/AdministratorDashboard.js
+++ b/client/src/routes/admin/AdministratorDashboard.js
@@ -15,8 +15,6 @@ import RecentReportsGeneratedAnalytics from "../../components/administrator/anal
 import UnvalidatedAccountAnalytics from "../../components/administrator/analytics/UnvalidatedAccountAnalytics";
 import UserAccountAnalytics from "../../components/administrator/analytics/UserAccountAnalytics";
 
-const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
-
 /**
  * A route that displays a collection of metrics describing the current
  * state of the system, it's users, and the health reports generated.
diff --git a/client/src/routes/merchant/MerchantGenerateReport.js b/client/src/routes/merchant/MerchantGenerateReport.js
index 9c686619..8af05ac5 100644
--- a/client/src/routes/merchant/MerchantGenerateReport.js
+++ b/client/src/routes/merchant/MerchantGenerateReport.js
@@ -1,5 +1,4 @@
 import { Box } from "@mui/material";
-import { useState } from "react";
 import MerchantReportForm from "../../components/healthReport/MerchantReportForm";
 
 /**
@@ -8,9 +7,7 @@ import MerchantReportForm from "../../components/healthReport/MerchantReportForm
  *
  * @returns {@mui.material.Container}
  */
-const MerchantGenerateReport = ({}) => {
-  const [page, setPage] = useState("manual");
-
+const MerchantGenerateReport = () => {
   return (
     <Box
       sx={{
diff --git a/client/src/routes/merchant/MerchantLanding.js b/client/src/routes/merchant/MerchantLanding.js
index 1d53f170..66442eb5 100644
--- a/client/src/routes/merchant/MerchantLanding.js
+++ b/client/src/routes/merchant/MerchantLanding.js
@@ -19,22 +19,10 @@ const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
  */
 const MerchantLanding = () => {
   const [data, setData] = useState({});
-  const [name, setName] = useState("");
 
   const theme = useTheme();
   const isMobile = useMediaQuery(theme.breakpoints.down("sm"));
 
-  useEffect(() => {
-    fetch(`${API_BASE}/user/me`, {
-      method: "GET",
-      credentials: "include",
-    })
-      .then((response) => response.json())
-      .then((user) => {
-        setName(user.name);
-      });
-  }, []);
-
   useEffect(() => {
     fetch(`${API_BASE}/merchant-dashboard`, {
       method: "GET",
@@ -65,14 +53,6 @@ const MerchantLanding = () => {
     },
   ];
 
-  function relativeTime(date) {
-    const diff = (Date.now() - new Date(date)) / 1000;
-    if (diff < 60) return "just now";
-    if (diff < 3600) return `${Math.floor(diff / 60)}m ago`;
-    if (diff < 86400) return `${Math.floor(diff / 3600)}h ago`;
-    return `${Math.floor(diff / 86400)}d ago`;
-  }
-
   return (
     <Box
       sx={{
diff --git a/client/src/routes/merchant/MerchantReports.js b/client/src/routes/merchant/MerchantReports.js
index 62220ef0..0ecf94d5 100644
--- a/client/src/routes/merchant/MerchantReports.js
+++ b/client/src/routes/merchant/MerchantReports.js
@@ -31,7 +31,7 @@ const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
  *
  * @returns {@mui.material.Box}
  */
-const MerchantReports = ({}) => {
+const MerchantReports = () => {
   const theme = useTheme();
   const isMobile = useMediaQuery(theme.breakpoints.down("sm"));
   const location = useLocation();
@@ -167,15 +167,7 @@ const MerchantReports = ({}) => {
     setReportDates(selectedReports);
     setSelectedDate(selectedReports[0]);
   }
-  const [isOpen, setIsOpen] = useState(false);
 
-  function openBar() {
-    if (isOpen === true) {
-      setIsOpen(false);
-      return;
-    }
-    setIsOpen(true);
-  }
   return (
     <Box
       sx={{
diff --git a/client/src/routes/merchant/PatientDetails.js b/client/src/routes/merchant/PatientDetails.js
index 92274be7..170d8d01 100644
--- a/client/src/routes/merchant/PatientDetails.js
+++ b/client/src/routes/merchant/PatientDetails.js
@@ -146,7 +146,7 @@ const PatientDetails = () => {
               >
                 Gender:
               </Box>{" "}
-              {patientData?.patientInfo?.gender == 1 ? "Male" : "Female"}
+              {patientData?.patientInfo?.gender === 1 ? "Male" : "Female"}
             </Typography>
 
             <Typography sx={{ borderBottom: "1px solid #E0E0E0", pb: 1.5 }}>
diff --git a/client/src/routes/merchant/PatientManagement.js b/client/src/routes/merchant/PatientManagement.js
index 6826f280..9592af1e 100644
--- a/client/src/routes/merchant/PatientManagement.js
+++ b/client/src/routes/merchant/PatientManagement.js
@@ -41,7 +41,6 @@ const PatientManagement = () => {
     pageSize: 25,
   });
   const [totalPatients, setTotalPatients] = useState(0);
-  const [loading, setLoading] = useState(false);
 
   const [deleteDialogOpen, setDeleteDialogOpen] = useState(false);
   const [selectedPatientID, setSelectedPatientID] = useState(null);
@@ -144,7 +143,6 @@ const PatientManagement = () => {
   }, [familyNameInput]);
 
   const fetchPatients = () => {
-    setLoading(true);
     const params = new URLSearchParams({
       skip: paginationModel.page * paginationModel.pageSize,
       limit: paginationModel.pageSize,
@@ -161,11 +159,9 @@ const PatientManagement = () => {
       .then((data) => {
         setPatientData(data.patients || []);
         setTotalPatients(data.totalPatients || 0);
-        setLoading(false);
       })
       .catch((err) => {
         console.log("An error has occurred");
-        setLoading(false);
       });
   };
 
diff --git a/client/src/routes/standardUser/HealthAnalytics.js b/client/src/routes/standardUser/HealthAnalytics.js
index b0facc4b..26567d7a 100644
--- a/client/src/routes/standardUser/HealthAnalytics.js
+++ b/client/src/routes/standardUser/HealthAnalytics.js
@@ -12,7 +12,6 @@ import {
   FormControlLabel,
   FormGroup,
   IconButton,
-  Stack,
   Typography,
   useMediaQuery,
   useTheme,
diff --git a/client/src/routes/standardUser/ReportHistory.js b/client/src/routes/standardUser/ReportHistory.js
index b74c6c0e..f3089d4c 100644
--- a/client/src/routes/standardUser/ReportHistory.js
+++ b/client/src/routes/standardUser/ReportHistory.js
@@ -29,7 +29,7 @@ const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
  *
  * @returns {@mui.material.Container}
  */
-const AIHealthPrediction = ({}) => {
+const AIHealthPrediction = () => {
   const theme = useTheme();
   const isMobile = useMediaQuery(theme.breakpoints.down("sm"));
 
@@ -37,18 +37,8 @@ const AIHealthPrediction = ({}) => {
   const [selectedDate, setSelectedDate] = useState();
   const [reportData, setReportData] = useState();
   const [deleteDialogOpen, setDeleteDialogOpen] = useState(false);
-  const [openSideBar, setOpenSideBar] = useState(false);
   const [selectedMonth, setSelectedMonth] = useState(null);
   const [selectedYear, setSelectedYear] = useState(null);
-  const [isOpen, setIsOpen] = useState(false);
-
-  function openBar() {
-    if (isOpen === true) {
-      setIsOpen(false);
-      return;
-    }
-    setIsOpen(true);
-  }
 
   function fetchReportDates() {
     fetch(`${API_BASE}/get-health-data-dates`, {
diff --git a/client/src/routes/standardUser/UserLanding.js b/client/src/routes/standardUser/UserLanding.js
index 7ed131b9..d6774339 100644
--- a/client/src/routes/standardUser/UserLanding.js
+++ b/client/src/routes/standardUser/UserLanding.js
@@ -9,7 +9,6 @@ import {
 } from "@mui/material";
 import { BarChart } from "@mui/x-charts/BarChart";
 import { useEffect, useState } from "react";
-import { useNavigate } from "react-router-dom";
 
 // AppBar height: 56px toolbar + 2px border on mobile (xs), 64px + 2px on desktop (sm+)
 const APPBAR_HEIGHT = { xs: "58px", sm: "66px" };
@@ -21,8 +20,7 @@ const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
  *
  * @returns {@mui.material.Box}
  */
-const UserLanding = ({}) => {
-  const navigate = useNavigate();
+const UserLanding = () => {
   const [name, setName] = useState(null);
   const [data, setData] = useState({});
 
diff --git a/client/src/utils/PublicOnlyRoutes.js b/client/src/utils/PublicOnlyRoutes.js
index 852b9c8a..77a87c94 100644
--- a/client/src/utils/PublicOnlyRoutes.js
+++ b/client/src/utils/PublicOnlyRoutes.js
@@ -11,7 +11,6 @@ const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
  */
 const PublicOnlyRoutes = () => {
   const [user, setUser] = useState(null);
-  const [loading, setLoading] = useState(true);
 
   useEffect(() => {
     fetch(`${API_BASE}/user/me`, {

From 351e541c2dcafe7f866370068b611f92e9d65cf9 Mon Sep 17 00:00:00 2001
From: Luke Bradley <bralc003@mymail.unisa.edu.au>
Date: Sun, 24 May 2026 15:09:05 +0930
Subject: [PATCH 083/105] Resolve eslint errors when running the application

---
 .../components/administrator/AuditLogTable.js | 16 +++--
 .../administrator/UserManagementTable.js      | 13 ++--
 .../healthReport/MerchantReportForm.js        |  2 +-
 client/src/routes/merchant/MerchantReports.js | 13 ++--
 client/src/routes/merchant/PatientDetails.js  |  2 +-
 .../src/routes/merchant/PatientManagement.js  | 68 +++++++++----------
 .../src/routes/standardUser/GenerateReport.js |  2 +-
 .../routes/standardUser/HealthAnalytics.js    |  5 +-
 .../src/routes/standardUser/ReportHistory.js  | 16 ++---
 9 files changed, 74 insertions(+), 63 deletions(-)

diff --git a/client/src/components/administrator/AuditLogTable.js b/client/src/components/administrator/AuditLogTable.js
index 68843858..0fb6e367 100644
--- a/client/src/components/administrator/AuditLogTable.js
+++ b/client/src/components/administrator/AuditLogTable.js
@@ -53,8 +53,9 @@ const AuditLogTable = () => {
   const [userEmail, setUserEmail] = useState("");
   const [eventType, setEventType] = useState("");
 
-  const fetchLogs = () => {
+  const fetchLogs = useCallback(() => {
     setLoading(true);
+
     const params = new URLSearchParams({
       skip: paginationModel.page * paginationModel.pageSize,
       limit: paginationModel.pageSize,
@@ -62,12 +63,15 @@ const AuditLogTable = () => {
 
     if (userEmail) params.append("user_email", userEmail);
     if (eventType) params.append("event_type", eventType);
+
     if (sortModel.length > 0) {
       params.append("sort_by", sortModel[0].field);
       params.append("sort_order", sortModel[0].sort || "desc");
     }
 
-    fetch(`${API_BASE}/logs?${params.toString()}`, { credentials: "include" })
+    fetch(`${API_BASE}/logs?${params.toString()}`, {
+      credentials: "include",
+    })
       .then((response) => {
         if (!response.ok) {
           throw new Error(response.status);
@@ -83,10 +87,6 @@ const AuditLogTable = () => {
         console.log(err);
         setLoading(false);
       });
-  };
-
-  useEffect(() => {
-    fetchLogs();
   }, [
     paginationModel.page,
     paginationModel.pageSize,
@@ -95,6 +95,10 @@ const AuditLogTable = () => {
     sortModel,
   ]);
 
+  useEffect(() => {
+    fetchLogs();
+  }, [fetchLogs]);
+
   const handleEmailSearchChange = useCallback((value) => {
     setPaginationModel((prev) => ({ ...prev, page: 0 }));
     setUserEmail(value);
diff --git a/client/src/components/administrator/UserManagementTable.js b/client/src/components/administrator/UserManagementTable.js
index 45e83bcb..127045f6 100644
--- a/client/src/components/administrator/UserManagementTable.js
+++ b/client/src/components/administrator/UserManagementTable.js
@@ -44,15 +44,18 @@ const UserManagementTable = () => {
 
   const API_BASE = process.env.REACT_APP_API_URL || "http://localhost:8000";
 
-  const fetchUsers = () => {
+  const fetchUsers = useCallback(() => {
     setLoading(true);
+
     const params = new URLSearchParams({
       skip: paginationModel.page * paginationModel.pageSize,
       limit: paginationModel.pageSize,
     });
+
     if (debouncedSearchQuery) {
       params.append("search", debouncedSearchQuery);
     }
+
     if (selectedClinic) {
       params.append("clinic_id", selectedClinic);
     }
@@ -79,10 +82,6 @@ const UserManagementTable = () => {
         console.log(err);
         setLoading(false);
       });
-  };
-
-  useEffect(() => {
-    fetchUsers();
   }, [
     API_BASE,
     paginationModel.page,
@@ -92,6 +91,10 @@ const UserManagementTable = () => {
     sortModel,
   ]);
 
+  useEffect(() => {
+    fetchUsers();
+  }, [fetchUsers]);
+
   useEffect(() => {
     setPaginationModel((prev) => ({ ...prev, page: 0 }));
   }, [API_BASE]);
diff --git a/client/src/components/healthReport/MerchantReportForm.js b/client/src/components/healthReport/MerchantReportForm.js
index 52786d87..7f2119b3 100644
--- a/client/src/components/healthReport/MerchantReportForm.js
+++ b/client/src/components/healthReport/MerchantReportForm.js
@@ -139,7 +139,7 @@ const MerchantReportForm = () => {
         }
       })
       .catch((err) => console.log(err));
-  }, []);
+  }, [defaultSelectedPatient]);
 
   function handleChangeCondition(e) {
     const {
diff --git a/client/src/routes/merchant/MerchantReports.js b/client/src/routes/merchant/MerchantReports.js
index 0ecf94d5..5ebd25f8 100644
--- a/client/src/routes/merchant/MerchantReports.js
+++ b/client/src/routes/merchant/MerchantReports.js
@@ -17,7 +17,7 @@ import {
   useTheme,
 } from "@mui/material";
 import IconButton from "@mui/material/IconButton";
-import { useEffect, useState } from "react";
+import { useEffect, useState, useCallback } from "react";
 import { useLocation } from "react-router-dom";
 import ConfirmationDialog from "../../components/dialog/confirmationDialog";
 import DownloadReportButton from "../../components/healthReport/DownloadReportButton";
@@ -49,7 +49,7 @@ const MerchantReports = () => {
   const [selectedMonth, setSelectedMonth] = useState(null);
   const [selectedYear, setSelectedYear] = useState(null);
 
-  function fetchMerchantReports() {
+  const fetchMerchantReports = useCallback(() => {
     fetch(`${API_BASE}/merchants/reports`, {
       credentials: "include",
     })
@@ -62,9 +62,11 @@ const MerchantReports = () => {
       .then((data) => {
         if (data.length > 0) {
           setReports(data);
+
           // Creates an array of distinct patient names
           let distinctPatientNames = [...new Set(data.map((r) => r.name))];
           setPatients(distinctPatientNames);
+
           setSelectedPatient(defaultSelectedPatientId);
           setSelectedDate(null);
 
@@ -72,6 +74,7 @@ const MerchantReports = () => {
             const selectedReports = data.filter(
               (r) => r.name === defaultSelectedPatientId,
             );
+
             setReportDates(selectedReports);
             setSelectedDate(selectedReports[0]); // Select first report
           }
@@ -79,13 +82,13 @@ const MerchantReports = () => {
       })
       .catch((err) => {
         console.log(err);
-      }, []);
-  }
+      });
+  }, [defaultSelectedPatientId]);
 
   // Fetch the merchant reports
   useEffect(() => {
     fetchMerchantReports();
-  }, []);
+  }, [fetchMerchantReports]);
 
   // Fetch report data
   useEffect(() => {
diff --git a/client/src/routes/merchant/PatientDetails.js b/client/src/routes/merchant/PatientDetails.js
index 170d8d01..68936e77 100644
--- a/client/src/routes/merchant/PatientDetails.js
+++ b/client/src/routes/merchant/PatientDetails.js
@@ -45,7 +45,7 @@ const PatientDetails = () => {
       .then((data) => {
         setPatientData(data);
       });
-  }, []);
+  }, [API_BASE, patientID, navigate]);
 
   const chartData = (patientData?.risks?.dates ?? [])
     .map((date, i) => ({
diff --git a/client/src/routes/merchant/PatientManagement.js b/client/src/routes/merchant/PatientManagement.js
index 9592af1e..67a875d6 100644
--- a/client/src/routes/merchant/PatientManagement.js
+++ b/client/src/routes/merchant/PatientManagement.js
@@ -13,7 +13,7 @@ import {
 } from "@mui/material";
 import InputAdornment from "@mui/material/InputAdornment";
 import { DataGrid } from "@mui/x-data-grid";
-import { useEffect, useState } from "react";
+import { useEffect, useState, useCallback } from "react";
 import { useNavigate } from "react-router-dom";
 import ConfirmationDialog from "../../components/dialog/confirmationDialog";
 
@@ -112,37 +112,7 @@ const PatientManagement = () => {
       ),
     },
   ];
-
-  useEffect(() => {
-    fetchPatients();
-  }, [
-    paginationModel.page,
-    paginationModel.pageSize,
-    givenNameInput,
-    familyNameInput,
-  ]);
-
-  // Debounce given name input
-  useEffect(() => {
-    const timer = setTimeout(() => {
-      // resetting page to 0 when filter changes
-      setPaginationModel((prev) => ({ ...prev, page: 0 }));
-      setGivenNameInput(givenNameInput);
-    }, 500);
-    return () => clearTimeout(timer);
-  }, [givenNameInput]);
-
-  // Debounce last name input
-  useEffect(() => {
-    const timer = setTimeout(() => {
-      // resetting page to 0 when filter changes
-      setPaginationModel((prev) => ({ ...prev, page: 0 }));
-      setFamilyNameInput(familyNameInput);
-    }, 500);
-    return () => clearTimeout(timer);
-  }, [familyNameInput]);
-
-  const fetchPatients = () => {
+  const fetchPatients = useCallback(() => {
     const params = new URLSearchParams({
       skip: paginationModel.page * paginationModel.pageSize,
       limit: paginationModel.pageSize,
@@ -161,9 +131,15 @@ const PatientManagement = () => {
         setTotalPatients(data.totalPatients || 0);
       })
       .catch((err) => {
-        console.log("An error has occurred");
+        console.log("An error has occurred", err);
       });
-  };
+  }, [
+    API_BASE,
+    paginationModel.page,
+    paginationModel.pageSize,
+    givenNameInput,
+    familyNameInput,
+  ]);
 
   async function handleDelete(patientID) {
     await fetch(`${API_BASE}/remove-patient/${patientID}`, {
@@ -178,6 +154,30 @@ const PatientManagement = () => {
     setDeleteDialogOpen(false);
   }
 
+  useEffect(() => {
+    fetchPatients();
+  }, [fetchPatients]);
+
+  // Debounce given name input
+  useEffect(() => {
+    const timer = setTimeout(() => {
+      // resetting page to 0 when filter changes
+      setPaginationModel((prev) => ({ ...prev, page: 0 }));
+      setGivenNameInput(givenNameInput);
+    }, 500);
+    return () => clearTimeout(timer);
+  }, [givenNameInput]);
+
+  // Debounce last name input
+  useEffect(() => {
+    const timer = setTimeout(() => {
+      // resetting page to 0 when filter changes
+      setPaginationModel((prev) => ({ ...prev, page: 0 }));
+      setFamilyNameInput(familyNameInput);
+    }, 500);
+    return () => clearTimeout(timer);
+  }, [familyNameInput]);
+
   return (
     <Box
       sx={{
diff --git a/client/src/routes/standardUser/GenerateReport.js b/client/src/routes/standardUser/GenerateReport.js
index fcb6c214..25f95b28 100644
--- a/client/src/routes/standardUser/GenerateReport.js
+++ b/client/src/routes/standardUser/GenerateReport.js
@@ -6,7 +6,7 @@ import GenerateReportForm from "../../components/healthReport/GenerateReportForm
  *
  * @returns {@mui.material.Box}
  */
-const GenerateReport = ({}) => {
+const GenerateReport = () => {
   return (
     <Box
       sx={{
diff --git a/client/src/routes/standardUser/HealthAnalytics.js b/client/src/routes/standardUser/HealthAnalytics.js
index 26567d7a..e104c0bd 100644
--- a/client/src/routes/standardUser/HealthAnalytics.js
+++ b/client/src/routes/standardUser/HealthAnalytics.js
@@ -107,7 +107,10 @@ const HealthAnalytics = () => {
   };
 
   // Helpers for aggregation and y-axis scaling
-  const colors = [theme.palette.primary.main, "#ff7043", "#42a5f5"];
+  const colors = useMemo(
+    () => [theme.palette.primary.main, "#ff7043", "#42a5f5"],
+    [theme.palette.primary.main],
+  );
 
   const cardWrapperSx = useMemo(
     () => ({
diff --git a/client/src/routes/standardUser/ReportHistory.js b/client/src/routes/standardUser/ReportHistory.js
index f3089d4c..e2d56dc5 100644
--- a/client/src/routes/standardUser/ReportHistory.js
+++ b/client/src/routes/standardUser/ReportHistory.js
@@ -1,6 +1,6 @@
 import CloseIcon from "@mui/icons-material/Close";
 import IconButton from "@mui/material/IconButton";
-import { useEffect, useState } from "react";
+import { useEffect, useState, useCallback } from "react";
 import ConfirmationDialog from "../../components/dialog/confirmationDialog";
 import DownloadReportButton from "../../components/healthReport/DownloadReportButton";
 import ReportTemplate from "../../components/healthReport/ReportTemplate";
@@ -40,7 +40,7 @@ const AIHealthPrediction = () => {
   const [selectedMonth, setSelectedMonth] = useState(null);
   const [selectedYear, setSelectedYear] = useState(null);
 
-  function fetchReportDates() {
+  const fetchReportDates = useCallback(() => {
     fetch(`${API_BASE}/get-health-data-dates`, {
       method: "GET",
       credentials: "include",
@@ -48,20 +48,18 @@ const AIHealthPrediction = () => {
       .then((response) => response.json())
       .then((data) => {
         setReportDates(data);
+
         if (data.length > 0) {
           setSelectedDate(data[0]);
-          console.log("The selected date is: " + selectedDate);
+          console.log("The selected date is:", data[0]);
         }
       })
-      .catch((err) => {
-        console.log(err);
-      });
-  }
+      .catch((err) => console.log(err));
+  }, []);
 
-  // Fetch the users health data ID and Dates
   useEffect(() => {
     fetchReportDates();
-  }, []);
+  }, [fetchReportDates]);
 
   // Fetch report data
   useEffect(() => {

From 80d28e5fd2240d6ec6ad14bca98e9381f742ce99 Mon Sep 17 00:00:00 2001
From: birjd002 <birjd002@mymail.unisa.edu.au>
Date: Sun, 24 May 2026 15:15:10 +0930
Subject: [PATCH 084/105] update: draft update README.md

---
 README.md | 208 +++++++++++++++++++++++++++++++++---------------------
 1 file changed, 129 insertions(+), 79 deletions(-)

diff --git a/README.md b/README.md
index aa4ea1e4..787b230c 100644
--- a/README.md
+++ b/README.md
@@ -1,85 +1,135 @@
-# Smart-Health-Predictive
-
-## Getting Started
-### Prerequisites
-- Node.js v22.x or higher
-- npm
-- FastApi (Python)
-- Docker Desktop
-
-### Running the Web Application
-1. Open a terminal and navigate to the project directory.
-2. Run the server.  
-```node server\src\server.js```
-3. Open a second terminal and navigate to the client folder in the project directory.  
-4. Install packages with npm and run the client.  
-```npm install```  
-```npm start```
-
-## Installing Required Modules
+
+<a href="https://wellai.app/">
+  <img src="client/src/assets/WellAiLogoTR.png" alt="WellAI logo" title="Well AI" height="60" align="right" >
+</a>
+
+
+# WellAI - Smart Health Predictive
+
+Smart Health Predictive empowers individuals to take control of their well-being through data-driven insights. Using AI-powered health analytics, WellAI helps you understand potential health risks early and make informed lifestyle choices for a better, healthier future.
+
+
+## Prerequisites
+- Node.js v22+
+- [Docker Desktop](https://www.docker.com/products/docker-desktop/)
+
+
+## How to Build
+
+1. To build the project:
+```shell
+# Navigate to https://github.com/A-Axisa/Smart-Health-Predictive
+
+# Ensure Git is installed
+# Open a terminal (Command Prompt or PowerShell for Windows, Terminal for macOS or Linux)
+
+# Clone the repository
+git clone https://github.com/A-Axisa/Smart-Health-Predictive.git
+
+# Navigate to the project directory and run the services
+docker compose up -d
+```
+
+
+## Services
+- Frontend: http://localhost:3000/
+- Backend: http://localhost:8000/
+- API Docs: http://localhost:8000/docs
+
+
+## Installing Dependencies (Manual)
+
+> [!NOTE]  
+> The docker-compose file already runs these commands automatically.
+
+### Client
+1. Navigate to ```root/client``` and run:
+```bash
+npm install
+```
+
 ### Server
-1. Open command prompt in the server directory of the project.
-2. Install the modules listed in the requirements.txt.  
-```pip3 install -r requirements.txt```
-
-## FastApi Setup
-### Initial Setup
-1. Open Command Prompt
-2. Run pip install ```"fastapi[standard]"```
-
-### Run FastApi
-1. Navigate to FastApi directory
-```cd server```
-2. (Optional) Configure extra CORS origins via environment variable (comma-separated). 
-```CORS_ORIGINS="https://example.com,https://another.example.com"```
-3. Run the server
-```fastapi dev main.py```
-4. Go to http://127.0.0.1:8000/docs to interact with API
-
-## Database Setup (Docker Compose + Alembic)
-### Initial Setup
-1. Have Docker running in the background.
-2. Navigate to the root directory.
-3. Create the container with:      
-```docker compose up -d```
-4. To update your database to the latest version, run the following command:      
-```alembic upgrade head```  
-
-*ADDITIONAL NOTES*:    
- Run the following command to downgrade the database:     
-**Warning: This command will drop *ALL* existing tables and their associated data**    
-```alembic downgrade base```  
+1. Navigate to ```root/server``` and run:
+```bash
+pip3 install -r requirements.txt
+```
 
-### Adding a Migration
-**Auto-generated migrations**
-1. Navigate to ```/server/models/dbmodels.py``` and modify/create tables as necessary.
-2. Navigate to the server directory.
-3. Run the following command to ensure you are on the current version:      
-```alembic upgrade head```  
-4. Run the following command to create the migration:   
-```alembic revision --autogenerate -m "Description of migration"```
-
-**Manual migrations**
-1. Navigate to the server directory.
-2. Run the following command to add a new version:  
-```alembic revision -m "Description of migration"```
-3. Navigate to ```/server/alembic/versions/nameOfNewVersion.py``` and locate the created version file.
-4. Refer to *https://alembic.sqlalchemy.org/en/latest/ops.html* for detail on creating/dropping tables.
-
-
-## Generating Dummy Data ##
-The script will generate random data directly into the database.  
+
+## Generating Dummy Data
+
+The script will generate random data directly into the database.
 The amount of data generated can be modified at the head of the script.
-1. Open a terminal and navigate to the root directory of the project.
-2. Run the following command to generate data:  
-```python -m server.tools.generate_dummy_data```
 
-## Running Playwright
+1. Navigate to the project directory:
+```bash
+python -m server.tools.generate_dummy_data
+```
+
+
+## Using Alembic
+
+To update your database to the latest migration run:
+```bash
+alembic upgrade head
+```
+
+To remove all tables and data run:
+```bash
+alembic downgrade base
+```  
+
+
+### Adding a Migration
+
+1. Navigate to ```root/server/models/dbmodels.py``` and modify/ create tables as necessary.
+2. Navigate to ```root/server``` and run:   
+```bash
+alembic upgrade head
+alembic revision --autogenerate -m "Your migration description."
+
+# This will auto-generate a version in /root/server/alembic/versions/
+```  
+
+Refer to the [Alembic Docs](https://alembic.sqlalchemy.org/en/latest/ops.html) for more detail.
+
+
+## Testing
+
+To run all integration tests, navigate to ```root/server```:
+```bash
+# Run the tests
+pytest
+```
+
+### End-to-end Testing
 1. If not already installed, run the command:  
-```npx playwright install```
-2. Open a terminal and navigate to the Client directory.
-3. run the command:  
-```npx playwright test```  
-4. Tests will now begin running and the terminal will log the status of completed tests.
-Proceeding this it will open a window in your browser with a more detailed overview. This can also
+```bash
+npx playwright install
+```
+2. Navigate to the ```root/client```:
+```bash
+npx playwright test
+```  
+Tests will now begin running and the terminal will log the status of completed tests.
+Following this it will open a window in your browser with a more detailed overview. This can also
 be accessed directly on http://localhost:9323/.
+
+### Load Testing
+1. If not already install k6 on your machine
+2. Navigate to the project directory:
+```bash
+# There are currently a number of test types you can run:
+# - average
+# - breakpoint
+# - smoke
+# - soak
+# - spike
+# - stress
+
+# To ensure that k6 is operational, run:
+
+k6 run load-tests/tests/smoke.js
+```
+
+
+[Return to top](#top)
\ No newline at end of file

From 40376ecc78936da9013b0fec3385c4bf297eeed8 Mon Sep 17 00:00:00 2001
From: birjd002 <birjd002@mymail.unisa.edu.au>
Date: Sun, 24 May 2026 15:22:17 +0930
Subject: [PATCH 085/105] fix: correct anchor ref for "Return to top text"

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 787b230c..3543c8ae 100644
--- a/README.md
+++ b/README.md
@@ -132,4 +132,4 @@ k6 run load-tests/tests/smoke.js
 ```
 
 
-[Return to top](#top)
\ No newline at end of file
+[Return to top](#wellai---smart-health-predictive)
\ No newline at end of file

From 9b502c795f14d4656a3838046231740479fca5eb Mon Sep 17 00:00:00 2001
From: birjd002 <birjd002@mymail.unisa.edu.au>
Date: Sun, 24 May 2026 15:47:55 +0930
Subject: [PATCH 086/105] update: update project logo and title

---
 client/public/favicon.ico | Bin 3870 -> 61784 bytes
 client/public/index.html  |   4 ++--
 client/public/logo.png    | Bin 0 -> 61784 bytes
 3 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 client/public/logo.png

diff --git a/client/public/favicon.ico b/client/public/favicon.ico
index a11777cc471a4344702741ab1c8a588998b1311a..b2fa7027b56f25dae71027a4dc1cb459d412170a 100644
GIT binary patch
literal 61784
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

literal 3870
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
baj7?x%VD!5Cxk2YbYLNVeiXvvpMCWYo=by@

diff --git a/client/public/index.html b/client/public/index.html
index aa069f27..ba69d485 100644
--- a/client/public/index.html
+++ b/client/public/index.html
@@ -9,7 +9,7 @@
       name="description"
       content="Web site created using create-react-app"
     />
-    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
+    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo.png" />
     <!--
       manifest.json provides metadata used when your web app is installed on a
       user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
@@ -24,7 +24,7 @@
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
-    <title>React App</title>
+    <title>Smart Health Predictive</title>
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>
diff --git a/client/public/logo.png b/client/public/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..b2fa7027b56f25dae71027a4dc1cb459d412170a
GIT binary patch
literal 61784
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

literal 0
HcmV?d00001


From cb3dea3a68f27041777fdc0bfff0f502c932339f Mon Sep 17 00:00:00 2001
From: birjd002 <birjd002@mymail.unisa.edu.au>
Date: Sun, 24 May 2026 15:52:27 +0930
Subject: [PATCH 087/105] fix: add render scaling to image

---
 client/src/components/healthReport/DownloadReportButton.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/components/healthReport/DownloadReportButton.js b/client/src/components/healthReport/DownloadReportButton.js
index 1c79aa84..0d70646c 100644
--- a/client/src/components/healthReport/DownloadReportButton.js
+++ b/client/src/components/healthReport/DownloadReportButton.js
@@ -50,7 +50,7 @@ const DownloadReportButton = ({
         meta?.fileNameHint ||
         `HealthReport_${String(meta?.healthDataID ?? healthDataId)}_${buildLocalDatePart(meta?.date)}.pdf`;
       
-      const canvas = await html2canvas(chartRef.current);
+      const canvas = await html2canvas(chartRef.current, {scale: 2});
       const chartImage = canvas.toDataURL("image/png");
 
       const blob = await pdf(

From 49fee27e2d354df1b24050db92cc6912e582f5da Mon Sep 17 00:00:00 2001
From: Luke Bradley <bralc003@mymail.unisa.edu.au>
Date: Sun, 24 May 2026 15:53:11 +0930
Subject: [PATCH 088/105] Fix merchant report form validation

---
 .../healthReport/MerchantReportForm.js        | 60 ++++++++-----------
 client/src/routes/merchant/MerchantReports.js |  2 +-
 server/routers/users.py                       |  1 +
 3 files changed, 28 insertions(+), 35 deletions(-)

diff --git a/client/src/components/healthReport/MerchantReportForm.js b/client/src/components/healthReport/MerchantReportForm.js
index 7f2119b3..7aa7e4ad 100644
--- a/client/src/components/healthReport/MerchantReportForm.js
+++ b/client/src/components/healthReport/MerchantReportForm.js
@@ -268,43 +268,35 @@ const MerchantReportForm = () => {
 
   function isAllInputsValid() {
     return (
-      weight !== null &&
-      weight.isValid &&
-      age !== null &&
-      age.isValid &&
-      height !== null &&
-      height.isValid &&
-      gender !== null &&
-      bloodGlucose !== null &&
-      bloodGlucose.isValid &&
-      apLow !== null &&
-      apLow.isValid &&
-      apHigh !== null &&
-      apHigh.isValid &&
-      maritalStatus !== "" &&
-      workingStatus !== "" &&
-      race !== "" &&
-      smoker !== "" &&
-      alcohol !== "" &&
-      selectedPatient !== null
+      weight?.isValid &&
+      age?.isValid &&
+      height?.isValid &&
+      gender != null &&
+      bloodGlucose?.isValid &&
+      apLow?.isValid &&
+      apHigh?.isValid &&
+      maritalStatus &&
+      workingStatus &&
+      race &&
+      smoker &&
+      alcohol &&
+      selectedPatient != null
     );
   }
   function updateAllInputFieldAlerts() {
-    setAlertWeightRequired(weight === null || !weight.isValid);
-    setAlertAgeRequired(age === null || !age.isValid);
-    setAlertHeightRequired(height === null || !height.isValid);
-    setAlertGenderRequired(gender === null);
-    setAlertBloodGlucoseRequired(
-      bloodGlucose === null || !bloodGlucose.isValid,
-    );
-    setAlertApLowRequired(apLow === null || !apLow.isValid);
-    setAlertApHighRequired(apHigh === null || !apHigh.isValid);
-    setAlertMaritalStatusRequired(maritalStatus === "");
-    setAlertWorkingStatusRequired(workingStatus === "");
-    setAlertPatientRequired(selectedPatient === null);
-    setAlertSmokerRequired(smoker === "");
-    setAlertAlcoholRequired(alcohol === "");
-    setAlertRaceRequired(race === "");
+    setAlertWeightRequired(!weight?.isValid);
+    setAlertAgeRequired(!age?.isValid);
+    setAlertHeightRequired(!height?.isValid);
+    setAlertGenderRequired(!gender);
+    setAlertBloodGlucoseRequired(!bloodGlucose?.isValid);
+    setAlertApLowRequired(!apLow?.isValid);
+    setAlertApHighRequired(!apHigh?.isValid);
+    setAlertMaritalStatusRequired(!maritalStatus);
+    setAlertWorkingStatusRequired(!workingStatus);
+    setAlertPatientRequired(!selectedPatient);
+    setAlertSmokerRequired(!smoker);
+    setAlertAlcoholRequired(!alcohol);
+    setAlertRaceRequired(!race);
   }
 
   // Fills in fields with information found in the blood reports.
diff --git a/client/src/routes/merchant/MerchantReports.js b/client/src/routes/merchant/MerchantReports.js
index 5ebd25f8..8f235737 100644
--- a/client/src/routes/merchant/MerchantReports.js
+++ b/client/src/routes/merchant/MerchantReports.js
@@ -292,7 +292,7 @@ const MerchantReports = () => {
                         variant="h7"
                         sx={{
                           fontWeight:
-                            selectedDate.healthDataId === item.healthDataId
+                            selectedDate?.healthDataId === item.healthDataId
                               ? 400
                               : 0,
                         }}
diff --git a/server/routers/users.py b/server/routers/users.py
index 6ed5da15..4d9f673d 100644
--- a/server/routers/users.py
+++ b/server/routers/users.py
@@ -1161,6 +1161,7 @@ async def get_merchant_patient_data(patient_id: int, request: Request, db_conn:
         "age": get_age(patient.DateOfBirth),
         "maritalStatus": patient.get_marital_status(),
         "workingStatus": patient.get_working_status(),
+        "race": patient.get_race()
     }
 
     return result

From bd36659fd5d6bca91eaeb4a3bd2636ffe12f908e Mon Sep 17 00:00:00 2001
From: Luke Bradley <bralc003@mymail.unisa.edu.au>
Date: Sun, 24 May 2026 15:56:57 +0930
Subject: [PATCH 089/105] Update navbar report history route

---
 client/src/components/Navbar.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/components/Navbar.js b/client/src/components/Navbar.js
index e1015f55..283ac71e 100644
--- a/client/src/components/Navbar.js
+++ b/client/src/components/Navbar.js
@@ -49,7 +49,7 @@ const NavBar = ({ role }) => {
     // User Pages
     "/user-landing": "Dashboard",
     "/generate-report": "Generate Report",
-    "/ai-health-prediction": "Report History",
+    "/report-history": "Report History",
     "/health-analytics": "Health Analytics",
     "/user-settings": "Settings",
 

From 99298582dc18a0c5b1722d2e0e1517259532fed4 Mon Sep 17 00:00:00 2001
From: Luke Bradley <bralc003@mymail.unisa.edu.au>
Date: Sun, 24 May 2026 16:14:12 +0930
Subject: [PATCH 090/105] Fix scan log error for PatientManagement

---
 client/src/routes/merchant/PatientManagement.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/routes/merchant/PatientManagement.js b/client/src/routes/merchant/PatientManagement.js
index 67a875d6..5604a512 100644
--- a/client/src/routes/merchant/PatientManagement.js
+++ b/client/src/routes/merchant/PatientManagement.js
@@ -131,7 +131,7 @@ const PatientManagement = () => {
         setTotalPatients(data.totalPatients || 0);
       })
       .catch((err) => {
-        console.log("An error has occurred", err);
+        console.log("An error has occurred");
       });
   }, [
     API_BASE,

From a27beac6b0b9bfe7ce6b588afd83226e82afe2d1 Mon Sep 17 00:00:00 2001
From: Luke Bradley <bralc003@mymail.unisa.edu.au>
Date: Sun, 24 May 2026 18:38:03 +0930
Subject: [PATCH 091/105] Remove permission and role permission DB tables

---
 .../d5c83d9c9af7_remove_unused_tables.py      | 51 +++++++++++++++++++
 server/models/dbmodels.py                     | 38 +-------------
 2 files changed, 52 insertions(+), 37 deletions(-)
 create mode 100644 server/alembic/versions/d5c83d9c9af7_remove_unused_tables.py

diff --git a/server/alembic/versions/d5c83d9c9af7_remove_unused_tables.py b/server/alembic/versions/d5c83d9c9af7_remove_unused_tables.py
new file mode 100644
index 00000000..0d6e6649
--- /dev/null
+++ b/server/alembic/versions/d5c83d9c9af7_remove_unused_tables.py
@@ -0,0 +1,51 @@
+"""Remove unused tables
+
+Revision ID: d5c83d9c9af7
+Revises: c173c206403b
+Create Date: 2026-05-24 18:37:06.230856
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import mysql
+
+# revision identifiers, used by Alembic.
+revision: str = 'd5c83d9c9af7'
+down_revision: Union[str, Sequence[str], None] = 'c173c206403b'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    """Upgrade schema."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table('RolePermission')
+    op.drop_table('Permission')
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    """Downgrade schema."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('Permission',
+    sa.Column('PermissionID', mysql.INTEGER(), autoincrement=True, nullable=False),
+    sa.Column('PermissionName', mysql.VARCHAR(length=100), nullable=True),
+    sa.PrimaryKeyConstraint('PermissionID'),
+    mysql_collate='utf8mb4_0900_ai_ci',
+    mysql_default_charset='utf8mb4',
+    mysql_engine='InnoDB'
+    )
+    op.create_table('RolePermission',
+    sa.Column('RoleID', mysql.INTEGER(), autoincrement=False, nullable=False),
+    sa.Column('PermissionID', mysql.INTEGER(), autoincrement=False, nullable=False),
+    sa.Column('AssignedAt', mysql.DATETIME(), server_default=sa.text('CURRENT_TIMESTAMP'), nullable=True),
+    sa.ForeignKeyConstraint(['PermissionID'], ['Permission.PermissionID'], name=op.f('RolePermission_ibfk_1')),
+    sa.ForeignKeyConstraint(['RoleID'], ['AccountRole.RoleID'], name=op.f('RolePermission_ibfk_2')),
+    sa.PrimaryKeyConstraint('RoleID', 'PermissionID'),
+    mysql_collate='utf8mb4_0900_ai_ci',
+    mysql_default_charset='utf8mb4',
+    mysql_engine='InnoDB'
+    )
+    # ### end Alembic commands ###
diff --git a/server/models/dbmodels.py b/server/models/dbmodels.py
index 1f431dad..d5a3b26a 100644
--- a/server/models/dbmodels.py
+++ b/server/models/dbmodels.py
@@ -88,7 +88,6 @@ class AccountRole(Base):
     RoleName = Column(String(100))
 
     userRoles = relationship("UserAccountRole", back_populates="role")
-    rolePermissions = relationship("RolePermission", back_populates="role")
 
     def __init__(self, RoleName):
         self.RoleName = RoleName
@@ -97,21 +96,6 @@ def __repr__(self):
         return f'AccountRole(RoleID={self.RoleID}, RoleName={self.RoleName})'
 
 
-class Permission(Base):
-    __tablename__ = 'Permission'
-    PermissionID = Column(Integer, primary_key=True)
-    PermissionName = Column(String(100))
-
-    permissionRoles = relationship(
-        "RolePermission", back_populates="permission")
-
-    def __init__(self, PermissionName):
-        self.PermissionName = PermissionName
-
-    def __repr__(self):
-        return f'Permission(PermissionID={self.PermissionID}, PermissionName={self.PermissionName})'
-
-
 class UserAccountRole(Base):
     __tablename__ = 'UserAccountRole'
     RoleID = Column(Integer, ForeignKey(
@@ -127,28 +111,8 @@ def __init__(self, RoleID, UserID):
         self.RoleID = RoleID
         self.UserID = UserID
 
-    def __repr(self):
-        return f'UserAccountRole(RoleID={self.RoleID}, UserID={self.UserID}, \
-                AssignedAt={self.AssignedAt})'
-
-
-class RolePermission(Base):
-    __tablename__ = 'RolePermission'
-    RoleID = Column(Integer, ForeignKey(
-        "AccountRole.RoleID"), primary_key=True)
-    PermissionID = Column(Integer, ForeignKey(
-        "Permission.PermissionID"), primary_key=True)
-    AssignedAt = Column(DateTime, server_default=text("CURRENT_TIMESTAMP"))
-
-    role = relationship("AccountRole", back_populates="rolePermissions")
-    permission = relationship("Permission", back_populates="permissionRoles")
-
-    def __init__(self, RoleID, PermissionID):
-        self.RoleID = RoleID
-        self.PermissionID = PermissionID
-
     def __repr__(self):
-        return f'RolePermission(RoleID={self.RoleID}, PermissionID={self.PermissionID}, \
+        return f'UserAccountRole(RoleID={self.RoleID}, UserID={self.UserID}, \
                 AssignedAt={self.AssignedAt})'
 
 

From 851c106a99063f520cfc598011e23ed62b73e581 Mon Sep 17 00:00:00 2001
From: birjd002 <birjd002@mymail.unisa.edu.au>
Date: Sun, 24 May 2026 22:07:23 +0930
Subject: [PATCH 092/105] fix: return string instead of error object

Testing if this works first before applying.
---
 client/src/routes/standardUser/ReportHistory.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/routes/standardUser/ReportHistory.js b/client/src/routes/standardUser/ReportHistory.js
index 4f925b5b..b20b4367 100644
--- a/client/src/routes/standardUser/ReportHistory.js
+++ b/client/src/routes/standardUser/ReportHistory.js
@@ -102,9 +102,9 @@ const AIHealthPrediction = ({}) => {
       })
         .then((res) => res.json())
         .then((data) => setReportData(data))
-        .catch((err) => console.log(err));
+        .catch(() => console.error("Failed to delete report data."));
     } catch (err) {
-      console.log(err);
+      console.error("Failed to delete report data.");
     }
     // Reload reports
     fetchReportDates();

From 53456be057b376eb518162c38078fc734315e965 Mon Sep 17 00:00:00 2001
From: birjd002 <birjd002@mymail.unisa.edu.au>
Date: Mon, 25 May 2026 00:46:16 +0930
Subject: [PATCH 093/105] fix: resolve leakage of information in logger message
 conflict

---
 client/src/components/Navbar.js                        |  1 -
 .../components/administrator/AccountApprovalTable.js   |  4 ++--
 client/src/components/administrator/AuditLogTable.js   |  2 +-
 .../components/administrator/UserManagementTable.js    | 10 +++++-----
 .../src/components/authentication/CreatePatientForm.js |  2 +-
 .../src/components/authentication/RegistrationForm.js  |  4 ++--
 .../src/components/healthReport/BloodReportUpload.js   |  2 +-
 .../components/healthReport/DownloadReportButton.js    |  2 +-
 .../src/components/healthReport/GenerateReportForm.js  |  4 ++--
 .../src/components/healthReport/MerchantReportForm.js  |  8 ++++----
 client/src/routes/merchant/MerchantReports.js          |  6 +++---
 client/src/routes/merchant/PatientManagement.js        |  4 ++--
 client/src/routes/standardUser/HealthAnalytics.js      |  3 +--
 client/src/routes/standardUser/ReportHistory.js        |  5 ++---
 client/src/routes/standardUser/UserSettings.js         |  2 +-
 15 files changed, 28 insertions(+), 31 deletions(-)

diff --git a/client/src/components/Navbar.js b/client/src/components/Navbar.js
index 8a9d3eb4..56d223a0 100644
--- a/client/src/components/Navbar.js
+++ b/client/src/components/Navbar.js
@@ -198,7 +198,6 @@ const NavBar = ({ role }) => {
 
   function handleOpenSettings(e) {
     setOpenMenu(e.currentTarget);
-    console.log(openMenu);
   }
 
   function handleCloseSettings() {
diff --git a/client/src/components/administrator/AccountApprovalTable.js b/client/src/components/administrator/AccountApprovalTable.js
index 9d2ae3b8..8e72883c 100644
--- a/client/src/components/administrator/AccountApprovalTable.js
+++ b/client/src/components/administrator/AccountApprovalTable.js
@@ -25,7 +25,7 @@ const AccountApprovalTable = ({}) => {
       })
       .then((data) => setUserData(data))
       .catch((err) => {
-        console.log(err);
+        console.error("Failed to fetch merchant data.");
       });
   };
 
@@ -49,7 +49,7 @@ const AccountApprovalTable = ({}) => {
         fetchMerchants();
       })
       .catch((err) => {
-        console.log(err);
+        console.error("Failed to validate merchant account.");
       });
   };
 
diff --git a/client/src/components/administrator/AuditLogTable.js b/client/src/components/administrator/AuditLogTable.js
index 7e4c241e..fef4864b 100644
--- a/client/src/components/administrator/AuditLogTable.js
+++ b/client/src/components/administrator/AuditLogTable.js
@@ -80,7 +80,7 @@ const AuditLogTable = () => {
         setLoading(false);
       })
       .catch((err) => {
-        console.log(err);
+        console.error("Failed to fetch log data.");
         setLoading(false);
       });
   };
diff --git a/client/src/components/administrator/UserManagementTable.js b/client/src/components/administrator/UserManagementTable.js
index 4c28ac26..6924ccad 100644
--- a/client/src/components/administrator/UserManagementTable.js
+++ b/client/src/components/administrator/UserManagementTable.js
@@ -84,7 +84,7 @@ const UserManagementTable = () => {
         setLoading(false);
       })
       .catch((err) => {
-        console.log(err);
+        console.error("Failed to fetch user data.");
         setLoading(false);
       });
   };
@@ -114,7 +114,7 @@ const UserManagementTable = () => {
       })
       .then((data) => setRoleData(data))
       .catch((err) => {
-        console.log(err);
+        console.error("Failed to fetch role data.");
       });
   }, [API_BASE]);
 
@@ -128,7 +128,7 @@ const UserManagementTable = () => {
       })
       .then((data) => setClinicData(data))
       .catch(() => {
-        console.log("Failed to fetch Clinics");
+        console.error("Failed to fetch clinic data.");
       });
   }, [API_BASE]);
 
@@ -170,7 +170,7 @@ const UserManagementTable = () => {
       setNewRole(null);
       setRowSelectionModel({ type: "include", ids: new Set() });
     } catch (err) {
-      console.log(err);
+      console.error("Failed to process request.");
     }
   };
 
@@ -204,7 +204,7 @@ const UserManagementTable = () => {
       setUserToDelete(null);
       setRowSelectionModel({ type: "include", ids: new Set() }); // Reset the checkbox after deletion.
     } catch (error) {
-      console.error("Delete user error:", error);
+      console.error("Failed to delete user.");
       setSnackbar({ open: true, message: error.message, severity: "error" });
     }
   };
diff --git a/client/src/components/authentication/CreatePatientForm.js b/client/src/components/authentication/CreatePatientForm.js
index ee30e215..153017eb 100644
--- a/client/src/components/authentication/CreatePatientForm.js
+++ b/client/src/components/authentication/CreatePatientForm.js
@@ -181,7 +181,7 @@ const CreatePatientForm = () => {
         return response.json();
       })
       .catch((err) => {
-        console.log("An error has occurred");
+        console.error("An error has occurred.");
       });
     setIsLoading(false);
   }
diff --git a/client/src/components/authentication/RegistrationForm.js b/client/src/components/authentication/RegistrationForm.js
index 748feac8..69ee8747 100644
--- a/client/src/components/authentication/RegistrationForm.js
+++ b/client/src/components/authentication/RegistrationForm.js
@@ -77,7 +77,7 @@ const RegistrationForm = () => {
     })
       .then((res) => res.json())
       .then((data) => setClinicList(data))
-      .catch((err) => console.log("An error has occurred"));
+      .catch((err) => console.error("An error has occurred."));
   }, []);
 
   function updateGivenName(e) {
@@ -281,7 +281,7 @@ const RegistrationForm = () => {
         setShowFailMessage(false);
       })
       .catch((error) => {
-        console.log(error);
+        console.error("User reigstration requeset failed.");
       });
     setIsLoading(false);
   }
diff --git a/client/src/components/healthReport/BloodReportUpload.js b/client/src/components/healthReport/BloodReportUpload.js
index cecdfffa..0c9d7af1 100644
--- a/client/src/components/healthReport/BloodReportUpload.js
+++ b/client/src/components/healthReport/BloodReportUpload.js
@@ -28,7 +28,7 @@ const BloodReportUpload = ({ onChange }) => {
     const file = e.target.files[0];
     await pdfToText(file)
       .then((text) => onChange?.(extractPatientInfoAsDict(text)))
-      .catch((error) => console.error(error));
+      .catch((error) => console.error("Failed to process blood report."));
   }
 
   function extractPatientInfoAsDict(text) {
diff --git a/client/src/components/healthReport/DownloadReportButton.js b/client/src/components/healthReport/DownloadReportButton.js
index d7c14104..96c0e9a4 100644
--- a/client/src/components/healthReport/DownloadReportButton.js
+++ b/client/src/components/healthReport/DownloadReportButton.js
@@ -56,7 +56,7 @@ const DownloadReportButton = ({
       saveAs(blob, fileName);
       if (onError) onError?.(null); // Clear previous errors on success
     } catch (error) {
-      console.error("Failed to download report:", error);
+      console.error("Failed to download report.");
       if (onError) onError(error.message);
     }
   };
diff --git a/client/src/components/healthReport/GenerateReportForm.js b/client/src/components/healthReport/GenerateReportForm.js
index 65070815..3e2ce540 100644
--- a/client/src/components/healthReport/GenerateReportForm.js
+++ b/client/src/components/healthReport/GenerateReportForm.js
@@ -121,7 +121,7 @@ const GenerateReportForm = () => {
         setWorkingStatus(data.workingStatus);
         setRace(data.race);
       } catch (err) {
-        console.log("Failed to fetch patient data.");
+        console.error("Failed to fetch patient data.");
       }
     }
     fetchPatientData();
@@ -355,7 +355,7 @@ const GenerateReportForm = () => {
         navigate("/report-history"); // Route the user to the Health prediction page after submission
       })
       .catch((error) => {
-        console.log("An error has occurred");
+        console.error("An error has occurred.");
       });
   }
 
diff --git a/client/src/components/healthReport/MerchantReportForm.js b/client/src/components/healthReport/MerchantReportForm.js
index 21512891..bf470211 100644
--- a/client/src/components/healthReport/MerchantReportForm.js
+++ b/client/src/components/healthReport/MerchantReportForm.js
@@ -135,7 +135,7 @@ const MerchantReportForm = () => {
           setPatientName(name.name);
         }
       })
-      .catch((err) => console.log(err));
+      .catch((err) => console.error("Failed to fetch patient names."));
   }, []);
 
   function handleChangeCondition(e) {
@@ -170,7 +170,7 @@ const MerchantReportForm = () => {
         setWorkingStatus(data.workingStatus);
         setRace(data.race);
       } catch (err) {
-        console.log("Failed to fetch patient data.");
+        console.error("Failed to fetch patient data.");
       }
     }
     fetchPatientData();
@@ -374,7 +374,7 @@ const MerchantReportForm = () => {
         return response.json();
       })
       .catch((error) => {
-        console.log("Something went wrong.");
+        console.error("Failed to process request.");
       });
     navigate("/merchant-reports");
     setIsLoading(false);
@@ -437,7 +437,7 @@ const MerchantReportForm = () => {
         }); // Route the user to the Health prediction page after submission
       })
       .catch((error) => {
-        console.log("Something went wrong");
+        console.error("Failed to process request.");
       });
   }
   const HiddenInput = styled("input")({
diff --git a/client/src/routes/merchant/MerchantReports.js b/client/src/routes/merchant/MerchantReports.js
index c0d7d42e..1ee5552f 100644
--- a/client/src/routes/merchant/MerchantReports.js
+++ b/client/src/routes/merchant/MerchantReports.js
@@ -82,7 +82,7 @@ const MerchantReports = ({}) => {
         }
       })
       .catch((err) => {
-        console.log(err);
+        console.error("Failed to fetch report data.");
       }, []);
   }
 
@@ -102,7 +102,7 @@ const MerchantReports = ({}) => {
     })
       .then((res) => res.json())
       .then((data) => setReportData(data))
-      .catch((err) => console.log(err));
+      .catch((err) => console.error("Failed to fetch report health data."));
   }, [selectedDate]);
 
   // Delete report data
@@ -127,7 +127,7 @@ const MerchantReports = ({}) => {
       setReportDates(patientReports);
       setSelectedDate(patientReports[0]);
     } catch (err) {
-      console.log(err);
+      console.error("Failed to delete report data.");
     }
     // Close Dialog
     setDeleteDialogOpen(false);
diff --git a/client/src/routes/merchant/PatientManagement.js b/client/src/routes/merchant/PatientManagement.js
index fbf6a874..07877580 100644
--- a/client/src/routes/merchant/PatientManagement.js
+++ b/client/src/routes/merchant/PatientManagement.js
@@ -159,7 +159,7 @@ const PatientManagement = () => {
         setLoading(false);
       })
       .catch((err) => {
-        console.log("An error has occurred");
+        console.error("An error has occurred.");
         setLoading(false);
       });
   };
@@ -171,7 +171,7 @@ const PatientManagement = () => {
     })
       .then((response) => response.json())
       .catch((err) => {
-        console.log("An error has occurred");
+        console.error("An error has occurred.");
       });
     fetchPatients();
     setDeleteDialogOpen(false);
diff --git a/client/src/routes/standardUser/HealthAnalytics.js b/client/src/routes/standardUser/HealthAnalytics.js
index db46f3d5..015cf17b 100644
--- a/client/src/routes/standardUser/HealthAnalytics.js
+++ b/client/src/routes/standardUser/HealthAnalytics.js
@@ -82,10 +82,9 @@ const HealthAnalytics = () => {
         throw new Error("Network response was not ok");
       }
       const data = await response.json();
-      //console.log("Fetched data:", data); // Log fetched data
       setHealthData(data);
     } catch (error) {
-      console.error("Failed to fetch health analytics data:", error);
+      console.error("Failed to fetch health analytics data.");
     }
   };
 
diff --git a/client/src/routes/standardUser/ReportHistory.js b/client/src/routes/standardUser/ReportHistory.js
index b20b4367..d613ad51 100644
--- a/client/src/routes/standardUser/ReportHistory.js
+++ b/client/src/routes/standardUser/ReportHistory.js
@@ -63,11 +63,10 @@ const AIHealthPrediction = ({}) => {
         setReportDates(data);
         if (data.length > 0) {
           setSelectedDate(data[0]);
-          console.log("The selected date is: " + selectedDate);
         }
       })
       .catch((err) => {
-        console.log(err);
+        console.error("Failed to fetch health data dates.");
       });
   }
 
@@ -87,7 +86,7 @@ const AIHealthPrediction = ({}) => {
     })
       .then((res) => res.json())
       .then((data) => setReportData(data))
-      .catch((err) => console.log(err));
+      .catch((err) => console.error("Failed to fetch report data."));
   }, [selectedDate]);
 
   // Delete report data
diff --git a/client/src/routes/standardUser/UserSettings.js b/client/src/routes/standardUser/UserSettings.js
index 866d0f85..29129d86 100644
--- a/client/src/routes/standardUser/UserSettings.js
+++ b/client/src/routes/standardUser/UserSettings.js
@@ -153,7 +153,7 @@ const UserSettings = () => {
         return response.json();
       })
       .catch((error) => {
-        console.log("Failed to change password");
+        console.error("Failed to change password.");
       });
   }
 

From 58b6e3af169c794401a8d5a60d90eded5ee3ada7 Mon Sep 17 00:00:00 2001
From: birjd002 <birjd002@mymail.unisa.edu.au>
Date: Mon, 25 May 2026 01:09:42 +0930
Subject: [PATCH 094/105] fix: resolve information exposure through an
 exception conflict

---
 server/routers/health_prediction.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/server/routers/health_prediction.py b/server/routers/health_prediction.py
index 6a68803f..28eb6f86 100644
--- a/server/routers/health_prediction.py
+++ b/server/routers/health_prediction.py
@@ -7,6 +7,7 @@
 from sqlalchemy.orm import Session
 import csv
 import codecs
+import logging
 
 from ..utils.database import get_db
 from ..models.dbmodels import HealthData, Prediction, Recommendation, UserAccount, UserPatientAccess, Patient, LogEventType
@@ -15,6 +16,8 @@
 from ..utils.audit_log import write_audit_log
 
 
+logger = logging.getLogger(__name__)
+
 # HealthData
 class HealthDataInput(CamelModel):
     age: int
@@ -233,8 +236,9 @@ async def predict(data: HealthDataInput, request: Request, db_conn: Session = De
                 db_conn=db_conn, health_data_id=int(_hd_id))
         else:
             recommendations = {"error": "Missing HealthDataID"}
-    except Exception as e:
-        recommendations = {"error": str(e)}
+    except Exception:
+        logger.error("Health recommendations failed to generate.")
+        recommendations = None
 
     # Persist recommendations when available
     exercise_rec = None
@@ -539,8 +543,9 @@ async def merchant_predict(data: MerchantHealthDataInput, request: Request, db_c
                 db_conn=db_conn, health_data_id=int(_hd_id))
         else:
             recommendations = {"error": "Missing HealthDataID"}
-    except Exception as e:
-        recommendations = {"error": str(e)}
+    except Exception:
+        logger.error("Health recommendations failed to generate.")
+        recommendations = None
 
     # Persist recommendations when available
     exercise_rec = None

From 8e08924ddbe68a0742d35ed8344821795eca5c63 Mon Sep 17 00:00:00 2001
From: birjd002 <birjd002@mymail.unisa.edu.au>
Date: Mon, 25 May 2026 01:24:36 +0930
Subject: [PATCH 095/105] fix: resolve usage of hard-coded secret conflict

---
 load-tests/scenarios/admin.js    | 8 +++++---
 load-tests/scenarios/merchant.js | 9 ++++++---
 load-tests/scenarios/user.js     | 9 ++++++---
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/load-tests/scenarios/admin.js b/load-tests/scenarios/admin.js
index 7088e7d7..c96ee9a2 100644
--- a/load-tests/scenarios/admin.js
+++ b/load-tests/scenarios/admin.js
@@ -2,14 +2,16 @@ import http from 'k6/http';
 import { check, sleep } from 'k6';
 
 
-const BASE_URL = 'http://localhost:8000';
+const BASE_URL = __ENV.BASEURL || 'http://localhost:8000';
+const TEST_EMAIL = __ENV.TEST_EMAIL || 'SHP_Admin@example.com'
+const TEST_PASSWORD = __ENV.TEST_PASSWORD || 'password12345678'
 
 export default function () {
   // Test login.
   let loginResult = http.post(`${BASE_URL}/login`,
     JSON.stringify({
-      email: 'SHP_Admin@example.com',
-      password: 'password12345678',
+      email: TEST_EMAIL,
+      password: TEST_PASSWORD,
   }), {
     headers: { 'Content-Type': 'application/json' },
   });
diff --git a/load-tests/scenarios/merchant.js b/load-tests/scenarios/merchant.js
index 163fb320..5c93efe2 100644
--- a/load-tests/scenarios/merchant.js
+++ b/load-tests/scenarios/merchant.js
@@ -1,15 +1,18 @@
 import http from "k6/http";
 import { check, sleep } from "k6";
 
-const BASE_URL = "http://localhost:8000";
+
+const BASE_URL = __ENV.BASEURL || 'http://localhost:8000';
+const TEST_EMAIL = __ENV.TEST_EMAIL || 'service@example.com'
+const TEST_PASSWORD = __ENV.TEST_PASSWORD || 'thisismypassword'
 
 export default function () {
   // Test login.
   let loginResult = http.post(
     `${BASE_URL}/login`,
     JSON.stringify({
-      email: "service@example.com",
-      password: "thisismypassword",
+      email: TEST_EMAIL,
+      password: TEST_PASSWORD,
     }),
     {
       headers: { "Content-Type": "application/json" },
diff --git a/load-tests/scenarios/user.js b/load-tests/scenarios/user.js
index 4e2b0941..9b5088ce 100644
--- a/load-tests/scenarios/user.js
+++ b/load-tests/scenarios/user.js
@@ -1,15 +1,18 @@
 import http from "k6/http";
 import { check, sleep } from "k6";
 
-const BASE_URL = "http://localhost:8000";
+
+const BASE_URL = __ENV.BASEURL || 'http://localhost:8000';
+const TEST_EMAIL = __ENV.TEST_EMAIL || 'audrey.young@example.com'
+const TEST_PASSWORD = __ENV.TEST_PASSWORD || 'whyaretherebirds'
 
 export default function () {
   // Test login.
   let loginResult = http.post(
     `${BASE_URL}/login`,
     JSON.stringify({
-      email: "audrey.young@example.com",
-      password: "whyaretherebirds",
+      email: TEST_EMAIL,
+      password: TEST_PASSWORD,
     }),
     {
       headers: { "Content-Type": "application/json" },

From 868da074228ac339c6aadee2b4cdfd205cfbccad Mon Sep 17 00:00:00 2001
From: birjd002 <birjd002@mymail.unisa.edu.au>
Date: Mon, 25 May 2026 01:39:21 +0930
Subject: [PATCH 096/105] fix: remove default credential values

---
 load-tests/scenarios/admin.js    | 4 ++--
 load-tests/scenarios/merchant.js | 4 ++--
 load-tests/scenarios/user.js     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/load-tests/scenarios/admin.js b/load-tests/scenarios/admin.js
index c96ee9a2..1b758e45 100644
--- a/load-tests/scenarios/admin.js
+++ b/load-tests/scenarios/admin.js
@@ -3,8 +3,8 @@ import { check, sleep } from 'k6';
 
 
 const BASE_URL = __ENV.BASEURL || 'http://localhost:8000';
-const TEST_EMAIL = __ENV.TEST_EMAIL || 'SHP_Admin@example.com'
-const TEST_PASSWORD = __ENV.TEST_PASSWORD || 'password12345678'
+const TEST_EMAIL = __ENV.TEST_EMAIL;
+const TEST_PASSWORD = __ENV.TEST_PASSWORD;
 
 export default function () {
   // Test login.
diff --git a/load-tests/scenarios/merchant.js b/load-tests/scenarios/merchant.js
index 5c93efe2..fe537e53 100644
--- a/load-tests/scenarios/merchant.js
+++ b/load-tests/scenarios/merchant.js
@@ -3,8 +3,8 @@ import { check, sleep } from "k6";
 
 
 const BASE_URL = __ENV.BASEURL || 'http://localhost:8000';
-const TEST_EMAIL = __ENV.TEST_EMAIL || 'service@example.com'
-const TEST_PASSWORD = __ENV.TEST_PASSWORD || 'thisismypassword'
+const TEST_EMAIL = __ENV.TEST_EMAIL;
+const TEST_PASSWORD = __ENV.TEST_PASSWORD;
 
 export default function () {
   // Test login.
diff --git a/load-tests/scenarios/user.js b/load-tests/scenarios/user.js
index 9b5088ce..6b042f38 100644
--- a/load-tests/scenarios/user.js
+++ b/load-tests/scenarios/user.js
@@ -3,8 +3,8 @@ import { check, sleep } from "k6";
 
 
 const BASE_URL = __ENV.BASEURL || 'http://localhost:8000';
-const TEST_EMAIL = __ENV.TEST_EMAIL || 'audrey.young@example.com'
-const TEST_PASSWORD = __ENV.TEST_PASSWORD || 'whyaretherebirds'
+const TEST_EMAIL = __ENV.TEST_EMAIL;
+const TEST_PASSWORD = __ENV.TEST_PASSWORD;
 
 export default function () {
   // Test login.

From b72fd8d2d65d6ae5e6b29c469b74c6ed7acf98aa Mon Sep 17 00:00:00 2001
From: birjd002 <birjd002@mymail.unisa.edu.au>
Date: Mon, 25 May 2026 14:52:18 +0930
Subject: [PATCH 097/105] fix: resolve observable timing discrepancy conflict

---
 .../authentication/PasswordInputField.js      |  2 +-
 .../authentication/RegistrationForm.js        | 21 ++++++++++++++-----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/client/src/components/authentication/PasswordInputField.js b/client/src/components/authentication/PasswordInputField.js
index d85347cf..8438c532 100644
--- a/client/src/components/authentication/PasswordInputField.js
+++ b/client/src/components/authentication/PasswordInputField.js
@@ -95,7 +95,7 @@ const PasswordInputField = ({
     if (!isAltered && !showRequired) {
       return null;
     }
-    if (password.length === 0 || password === null || showRequired) {
+    if (password.length < 1 || password === null || showRequired) {
       return "*Required";
     }
 
diff --git a/client/src/components/authentication/RegistrationForm.js b/client/src/components/authentication/RegistrationForm.js
index 69ee8747..4a20999f 100644
--- a/client/src/components/authentication/RegistrationForm.js
+++ b/client/src/components/authentication/RegistrationForm.js
@@ -80,6 +80,17 @@ const RegistrationForm = () => {
       .catch((err) => console.error("An error has occurred."));
   }, []);
 
+  function stringEqual(a, b) {
+    if (a.length !== b.length) {
+      return false;
+    }
+    let diff = 0;
+    for (let i = 0; i < a.length; i++) {
+      diff |= a.charCodeAt(i) ^ b.charCodeAt(i);
+    }
+    return diff === 0;
+  }
+
   function updateGivenName(e) {
     const isNameValid = e.target.value !== "";
     setGivenNameState({ isValid: isNameValid, name: e.target.value });
@@ -134,7 +145,7 @@ const RegistrationForm = () => {
     const confirmPasswordInput = e.target.value;
     setConfirmPassword(confirmPasswordInput);
     setAlertPasswordsDontMatch(
-      confirmPasswordInput !== passwordState.password ||
+      !stringEqual(confirmPasswordInput, passwordState.password) ||
         confirmPasswordInput === "",
     );
   }
@@ -182,7 +193,7 @@ const RegistrationForm = () => {
     setAlertPasswordRequired(passwordState === null);
     setAlertPasswordsDontMatch(
       passwordState === null ||
-        confirmPassword !== passwordState.password ||
+        !stringEqual(confirmPassword, passwordState.password) ||
         confirmPassword === "",
     );
     setAlertGenderRequired(genderState === "");
@@ -194,7 +205,7 @@ const RegistrationForm = () => {
     setAlertPasswordRequired(passwordState === null);
     setAlertPasswordsDontMatch(
       passwordState === null ||
-        confirmPassword !== passwordState.password ||
+        !stringEqual(confirmPassword, passwordState.password) ||
         confirmPassword === "",
     );
     setAlertClinicRequired(clinicState === "");
@@ -214,7 +225,7 @@ const RegistrationForm = () => {
       (phoneState === null || phoneState.isValid) &&
       passwordState !== null &&
       passwordState.isValid &&
-      passwordState.password === confirmPassword
+      stringEqual(passwordState.password, confirmPassword)
     );
   }
 
@@ -225,7 +236,7 @@ const RegistrationForm = () => {
       (phoneState === null || phoneState.isValid) &&
       passwordState !== null &&
       passwordState.isValid &&
-      passwordState.password === confirmPassword &&
+      stringEqual(passwordState.password, confirmPassword) &&
       clinicState !== ""
     );
   }

From 921983e1fe4d5fcaae39c28b886f8c594344d062 Mon Sep 17 00:00:00 2001
From: birjd002 <birjd002@mymail.unisa.edu.au>
Date: Mon, 25 May 2026 15:04:57 +0930
Subject: [PATCH 098/105] chore: move xor func to util folder

used by UserSettings and RegistrationForm
---
 .../authentication/RegistrationForm.js         | 12 +-----------
 client/src/routes/standardUser/UserSettings.js |  4 +++-
 client/src/utils/stringEqual.js                | 18 ++++++++++++++++++
 3 files changed, 22 insertions(+), 12 deletions(-)
 create mode 100644 client/src/utils/stringEqual.js

diff --git a/client/src/components/authentication/RegistrationForm.js b/client/src/components/authentication/RegistrationForm.js
index 4a20999f..5ebf184e 100644
--- a/client/src/components/authentication/RegistrationForm.js
+++ b/client/src/components/authentication/RegistrationForm.js
@@ -26,6 +26,7 @@ import PasswordInputField from "../authentication/PasswordInputField";
 import EmailInputField from "../authentication/EmailInputField";
 import PhoneInputField from "../authentication/PhoneInputField";
 import Logo from "../../assets/WellAiLogoTR.png";
+import { stringEqual } from "../../utils/stringEqual";
 
 const FULL_NAME_MAX_LENGTH = 255;
 const ACCOUNT_TYPES = Object.freeze({
@@ -80,17 +81,6 @@ const RegistrationForm = () => {
       .catch((err) => console.error("An error has occurred."));
   }, []);
 
-  function stringEqual(a, b) {
-    if (a.length !== b.length) {
-      return false;
-    }
-    let diff = 0;
-    for (let i = 0; i < a.length; i++) {
-      diff |= a.charCodeAt(i) ^ b.charCodeAt(i);
-    }
-    return diff === 0;
-  }
-
   function updateGivenName(e) {
     const isNameValid = e.target.value !== "";
     setGivenNameState({ isValid: isNameValid, name: e.target.value });
diff --git a/client/src/routes/standardUser/UserSettings.js b/client/src/routes/standardUser/UserSettings.js
index 29129d86..ee888b2b 100644
--- a/client/src/routes/standardUser/UserSettings.js
+++ b/client/src/routes/standardUser/UserSettings.js
@@ -22,6 +22,8 @@ import ConfirmationDialog from "../../components/dialog/confirmationDialog";
 import { useNavigate } from "react-router-dom";
 import { UserContext } from "../../utils/UserContext";
 import PhoneInputField from "../../components/authentication/PhoneInputField";
+import { stringEqual } from "../../utils/stringEqual";
+
 
 /**
  * A page that provides the tools for a user to securely update their
@@ -517,7 +519,7 @@ const UserSettings = () => {
   const Password = () => {
     const mismatch =
       passwordData.confirmPassword &&
-      passwordData.newPassword !== passwordData.confirmPassword;
+      !stringEqual(passwordData.newPassword, passwordData.confirmPassword);
     const disabled =
       !passwordData.currentPassword || !passwordData.newPassword || mismatch;
     return (
diff --git a/client/src/utils/stringEqual.js b/client/src/utils/stringEqual.js
new file mode 100644
index 00000000..019f51cf
--- /dev/null
+++ b/client/src/utils/stringEqual.js
@@ -0,0 +1,18 @@
+/**
+ * Compares two strings in constant time using XOR.
+ *
+ * @param {string} a - The first string to compare
+ * @param {string} b - The second string to compare
+ * 
+ * @returns {boolean} True if the strings are equal, false otherwise
+ */
+export function stringEqual(a, b) {
+  if (a.length !== b.length) {
+    return false;
+  }
+  let diff = 0;
+  for (let i = 0; i < a.length; i++) {
+    diff |= a.charCodeAt(i) ^ b.charCodeAt(i);
+  }
+  return diff === 0;
+}

From 618dcc3c9f7be7b72681ed8daa7f05210698830a Mon Sep 17 00:00:00 2001
From: birjd002 <birjd002@mymail.unisa.edu.au>
Date: Mon, 25 May 2026 15:16:37 +0930
Subject: [PATCH 099/105] fix: add bearer suppression comment to non-vulnerable
 code

---
 server/routers/authentication.py    | 1 +
 server/tools/generate_dummy_data.py | 1 +
 2 files changed, 2 insertions(+)

diff --git a/server/routers/authentication.py b/server/routers/authentication.py
index 271f9205..c6208535 100644
--- a/server/routers/authentication.py
+++ b/server/routers/authentication.py
@@ -334,6 +334,7 @@ async def login(request: Request, response: Response, user_cred: LoginCredential
 
     cookie_settings = _cookie_security_settings(request)
 
+    # bearer:disable python_django_cookies
     response.set_cookie(
         key='auth_token',
         value=token,
diff --git a/server/tools/generate_dummy_data.py b/server/tools/generate_dummy_data.py
index d7c6c11b..4384d30e 100644
--- a/server/tools/generate_dummy_data.py
+++ b/server/tools/generate_dummy_data.py
@@ -76,6 +76,7 @@ class UserRoleID(Enum):
 
 def load_names_csv(filename: str):
     '''Loads all the names in the CSV file to use in the dummy data'''
+    # bearer:disable python_lang_path_traversal
     with open(filename, encoding="utf-8") as csv_file:
         csv_reader = csvReader(csv_file, delimiter=',')
         for row in csv_reader:

From fd4130755eecdbbb5b573715f3825350cb8b6a46 Mon Sep 17 00:00:00 2001
From: Luke Bradley <bralc003@mymail.unisa.edu.au>
Date: Mon, 25 May 2026 17:16:24 +0930
Subject: [PATCH 100/105] Fix issues after resolving merge conflict

---
 client/src/routes/merchant/MerchantReports.js | 32 +++++++++++++------
 .../src/routes/standardUser/ReportHistory.js  | 25 +++++++++++----
 2 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/client/src/routes/merchant/MerchantReports.js b/client/src/routes/merchant/MerchantReports.js
index 44b60f63..fd61a682 100644
--- a/client/src/routes/merchant/MerchantReports.js
+++ b/client/src/routes/merchant/MerchantReports.js
@@ -17,7 +17,8 @@ import {
   useTheme,
 } from "@mui/material";
 import IconButton from "@mui/material/IconButton";
-import { useEffect, useState, useCallback } from "react";
+import PDFHealthChart from "../../components/healthReport/PDFHealthChart";
+import React, { useState, useEffect, useRef, useCallback } from "react";
 import { useLocation } from "react-router-dom";
 import ConfirmationDialog from "../../components/dialog/confirmationDialog";
 import DownloadReportButton from "../../components/healthReport/DownloadReportButton";
@@ -139,12 +140,15 @@ const MerchantReports = () => {
     if (!selectedDate) {
       return;
     }
-    fetch(`${API_BASE}/health-analytics?health_data_id=${selectedDate.healthDataId}`, {
-      credentials: "include",
-    })
-    .then((r) => r.json())
-    .then(setChartData)
-    .catch(console.error);
+    fetch(
+      `${API_BASE}/health-analytics?health_data_id=${selectedDate.healthDataId}`,
+      {
+        credentials: "include",
+      },
+    )
+      .then((r) => r.json())
+      .then(setChartData)
+      .catch(console.error);
   }, [selectedDate]);
 
   // Extract and sort month and years for drop down.
@@ -195,8 +199,18 @@ const MerchantReports = () => {
         mt: "80px",
       }}
     >
-      <div style={{ position: "fixed", top: -9999, left: -9999, pointerEvents: "none", overflow: "hidden", width: 0, height: 0 }}>
-          <PDFHealthChart ref={chartRef} healthData={chartData} />
+      <div
+        style={{
+          position: "fixed",
+          top: -9999,
+          left: -9999,
+          pointerEvents: "none",
+          overflow: "hidden",
+          width: 0,
+          height: 0,
+        }}
+      >
+        <PDFHealthChart ref={chartRef} healthData={chartData} />
       </div>
 
       <Box
diff --git a/client/src/routes/standardUser/ReportHistory.js b/client/src/routes/standardUser/ReportHistory.js
index f5b35b8c..4347e366 100644
--- a/client/src/routes/standardUser/ReportHistory.js
+++ b/client/src/routes/standardUser/ReportHistory.js
@@ -1,10 +1,11 @@
 import CloseIcon from "@mui/icons-material/Close";
 import IconButton from "@mui/material/IconButton";
-import { useEffect, useState, useCallback } from "react";
+import { useEffect, useState, useCallback, useRef } from "react";
 import ConfirmationDialog from "../../components/dialog/confirmationDialog";
 import DownloadReportButton from "../../components/healthReport/DownloadReportButton";
 import ReportTemplate from "../../components/healthReport/ReportTemplate";
 import { Link as RouterLink } from "react-router-dom";
+import PDFHealthChart from "../../components/healthReport/PDFHealthChart";
 
 import {
   Box,
@@ -39,6 +40,8 @@ const AIHealthPrediction = () => {
   const [deleteDialogOpen, setDeleteDialogOpen] = useState(false);
   const [selectedMonth, setSelectedMonth] = useState(null);
   const [selectedYear, setSelectedYear] = useState(null);
+  const chartRef = useRef(null);
+  const [chartData, setChartData] = useState([]);
 
   const fetchReportDates = useCallback(() => {
     fetch(`${API_BASE}/get-health-data-dates`, {
@@ -102,9 +105,9 @@ const AIHealthPrediction = () => {
     fetch(`${API_BASE}/health-analytics`, {
       credentials: "include",
     })
-    .then((r) => r.json())
-    .then(setChartData)
-    .catch(console.error);
+      .then((r) => r.json())
+      .then(setChartData)
+      .catch(console.error);
   }, []);
 
   // Extract and sort month and years for drop down.
@@ -187,10 +190,20 @@ const AIHealthPrediction = () => {
           mt: "80px",
         }}
       >
-        <div style={{ position: "fixed", top: -9999, left: -9999, pointerEvents: "none", overflow: "hidden", width: 0, height: 0 }}>
+        <div
+          style={{
+            position: "fixed",
+            top: -9999,
+            left: -9999,
+            pointerEvents: "none",
+            overflow: "hidden",
+            width: 0,
+            height: 0,
+          }}
+        >
           <PDFHealthChart ref={chartRef} healthData={chartData} />
         </div>
-        
+
         <Paper variant="report-section">
           <Box sx={{ p: 3, borderBottom: "1px solid #e0e0e0" }}>
             <Typography

From cc6bbc13ac39bc1012bafb9bbf0061a7e63ac99b Mon Sep 17 00:00:00 2001
From: Luke Bradley <bralc003@mymail.unisa.edu.au>
Date: Mon, 25 May 2026 17:32:18 +0930
Subject: [PATCH 101/105] Update mobile ui for PatientAcessRequest

---
 .../RequestPatientAccessForm.js               | 16 ++++-----
 .../routes/merchant/RequestPatientAccess.js   | 35 ++++++++++++-------
 2 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/client/src/components/patientAccessRequest/RequestPatientAccessForm.js b/client/src/components/patientAccessRequest/RequestPatientAccessForm.js
index 71a4d349..35dfbdec 100644
--- a/client/src/components/patientAccessRequest/RequestPatientAccessForm.js
+++ b/client/src/components/patientAccessRequest/RequestPatientAccessForm.js
@@ -5,6 +5,7 @@ import {
   Divider,
   Stack,
   Typography,
+  Card,
 } from "@mui/material";
 import { useState } from "react";
 import { Link as RouterLink } from "react-router-dom";
@@ -64,14 +65,11 @@ const RequestPatientAccessForm = () => {
   }
 
   return (
-    <Container
+    <Card
       sx={{
-        borderRadius: { xs: 0, sm: 2 },
-        padding: "40px",
         alignItems: "center",
-        boxShadow: 24,
-        backgroundColor: "#ffffff",
         width: { xs: "auto", sm: "500px" },
+        minHeight: { xs: "100vh", sm: "auto" },
         flexGrow: { xs: 1, sm: 0 },
       }}
     >
@@ -85,8 +83,10 @@ const RequestPatientAccessForm = () => {
           style={{ justifyContent: "center" }}
         >
           <Stack direction="column" spacing={{ xs: 2 }}>
-            <h1>Request Access to Existing Patient Record</h1>
-            <Typography align="start" style={{ color: "#777777" }}>
+            <Typography variant="h4" align="center">
+              Request Access to Existing Patient Record{" "}
+            </Typography>
+            <Typography variant="subtle" align="start">
               Enter the email of the patient you are requesting access for.
             </Typography>
             {errorMessage && (
@@ -155,7 +155,7 @@ const RequestPatientAccessForm = () => {
           </Button>
         </Stack>
       )}
-    </Container>
+    </Card>
   );
 };
 
diff --git a/client/src/routes/merchant/RequestPatientAccess.js b/client/src/routes/merchant/RequestPatientAccess.js
index 4da43a11..0cfeb7ef 100644
--- a/client/src/routes/merchant/RequestPatientAccess.js
+++ b/client/src/routes/merchant/RequestPatientAccess.js
@@ -8,23 +8,32 @@ import RequestPatientAccessForm from "../../components/patientAccessRequest/Requ
  */
 const RequestPatientAccess = () => {
   return (
-    <Container
-      variant="gradient"
-      maxWidth={false}
+    <Box
       sx={{
-        width: "100vw",
-        minHeight: "100vh",
-        padding: "0",
-        margin: "0",
+        bgcolor: "#f5f5f5",
         display: "flex",
-        alignItems: { xs: "flex-start", sm: "center" },
-        justifyContent: "center",
+        ml: "65px",
+        mt: "66px",
       }}
     >
-      <Box variant="gradient">
-        <RequestPatientAccessForm />
-      </Box>
-    </Container>
+      <Container
+        variant="gradient"
+        maxWidth={false}
+        sx={{
+          width: "100vw",
+          minHeight: "100vh",
+          padding: "0",
+          margin: "0",
+          display: "flex",
+          alignItems: { xs: "flex-start", sm: "center" },
+          justifyContent: "center",
+        }}
+      >
+        <Box variant="gradient">
+          <RequestPatientAccessForm />
+        </Box>
+      </Container>
+    </Box>
   );
 };
 

From d5d0d285ee7ac974396d801a85ed0a784366f6e6 Mon Sep 17 00:00:00 2001
From: Luke Bradley <bralc003@mymail.unisa.edu.au>
Date: Mon, 25 May 2026 17:35:10 +0930
Subject: [PATCH 102/105] Update UI for accept access request form

---
 .../patientAccessRequest/AcceptRequestForm.js | 13 +++----
 .../RequestPatientAccessForm.js               | 10 +-----
 .../standardUser/AcceptAccessRequest.js       | 35 ++++++++++++-------
 3 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/client/src/components/patientAccessRequest/AcceptRequestForm.js b/client/src/components/patientAccessRequest/AcceptRequestForm.js
index 965bee90..c3213736 100644
--- a/client/src/components/patientAccessRequest/AcceptRequestForm.js
+++ b/client/src/components/patientAccessRequest/AcceptRequestForm.js
@@ -1,7 +1,7 @@
 import {
   Box,
   Button,
-  Container,
+  Card,
   Divider,
   List,
   ListItem,
@@ -55,14 +55,11 @@ const AcceptRequestForm = () => {
   }
 
   return (
-    <Container
+    <Card
       sx={{
-        borderRadius: { xs: 0, sm: 2 },
-        padding: "40px",
         alignItems: "center",
-        boxShadow: 24,
-        backgroundColor: "#ffffff",
         width: { xs: "auto", sm: "500px" },
+        minHeight: { xs: "100vh", sm: "auto" },
         flexGrow: { xs: 1, sm: 0 },
       }}
     >
@@ -76,7 +73,7 @@ const AcceptRequestForm = () => {
           style={{ justifyContent: "center" }}
         >
           <Stack direction="column" spacing={{ xs: 2 }}>
-            <Typography variant="h4" fontWeight={600}>
+            <Typography variant="h4" align="center">
               Partner Access Request
             </Typography>
             <Typography align="start">
@@ -158,7 +155,7 @@ const AcceptRequestForm = () => {
           </Button>
         </Stack>
       )}
-    </Container>
+    </Card>
   );
 };
 
diff --git a/client/src/components/patientAccessRequest/RequestPatientAccessForm.js b/client/src/components/patientAccessRequest/RequestPatientAccessForm.js
index 35dfbdec..e417a84a 100644
--- a/client/src/components/patientAccessRequest/RequestPatientAccessForm.js
+++ b/client/src/components/patientAccessRequest/RequestPatientAccessForm.js
@@ -1,12 +1,4 @@
-import {
-  Box,
-  Button,
-  Container,
-  Divider,
-  Stack,
-  Typography,
-  Card,
-} from "@mui/material";
+import { Box, Button, Card, Divider, Stack, Typography } from "@mui/material";
 import { useState } from "react";
 import { Link as RouterLink } from "react-router-dom";
 import EmailInputField from "../authentication/EmailInputField";
diff --git a/client/src/routes/standardUser/AcceptAccessRequest.js b/client/src/routes/standardUser/AcceptAccessRequest.js
index 0acb0c43..1508e057 100644
--- a/client/src/routes/standardUser/AcceptAccessRequest.js
+++ b/client/src/routes/standardUser/AcceptAccessRequest.js
@@ -9,23 +9,32 @@ import AcceptRequestForm from "../../components/patientAccessRequest/AcceptReque
  */
 const AcceptAccessRequest = () => {
   return (
-    <Container
-      variant="gradient"
-      maxWidth={false}
+    <Box
       sx={{
-        width: "100vw",
-        minHeight: "100vh",
-        padding: "0",
-        margin: "0",
+        bgcolor: "#f5f5f5",
         display: "flex",
-        alignItems: { xs: "flex-start", sm: "center" },
-        justifyContent: "center",
+        ml: "65px",
+        mt: "66px",
       }}
     >
-      <Box variant="gradient">
-        <AcceptRequestForm />
-      </Box>
-    </Container>
+      <Container
+        variant="gradient"
+        maxWidth={false}
+        sx={{
+          width: "100vw",
+          minHeight: "100vh",
+          padding: "0",
+          margin: "0",
+          display: "flex",
+          alignItems: { xs: "flex-start", sm: "center" },
+          justifyContent: "center",
+        }}
+      >
+        <Box variant="gradient">
+          <AcceptRequestForm />
+        </Box>
+      </Container>
+    </Box>
   );
 };
 

From 3a75ef1a4f881efb0bc6a682cf3b3521b7712cf5 Mon Sep 17 00:00:00 2001
From: birjd002 <birjd002@mymail.unisa.edu.au>
Date: Mon, 25 May 2026 18:00:36 +0930
Subject: [PATCH 103/105] fix: replace length and null check with false check

---
 client/src/components/authentication/PasswordInputField.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/components/authentication/PasswordInputField.js b/client/src/components/authentication/PasswordInputField.js
index 8438c532..308d7856 100644
--- a/client/src/components/authentication/PasswordInputField.js
+++ b/client/src/components/authentication/PasswordInputField.js
@@ -95,7 +95,7 @@ const PasswordInputField = ({
     if (!isAltered && !showRequired) {
       return null;
     }
-    if (password.length < 1 || password === null || showRequired) {
+    if (!password || showRequired) {
       return "*Required";
     }
 

From d2c0d420edf2e2b5941a16ce7607f9ee075dd8b4 Mon Sep 17 00:00:00 2001
From: Luke Bradley <bralc003@mymail.unisa.edu.au>
Date: Mon, 25 May 2026 18:54:22 +0930
Subject: [PATCH 104/105] Fix errors after merging security SPH-183

---
 client/src/components/Navbar.js               | 8 --------
 client/src/routes/merchant/MerchantReports.js | 4 ++--
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/client/src/components/Navbar.js b/client/src/components/Navbar.js
index 38341a87..283ac71e 100644
--- a/client/src/components/Navbar.js
+++ b/client/src/components/Navbar.js
@@ -186,14 +186,6 @@ const NavBar = ({ role }) => {
     }
   }
 
-  function handleOpenSettings(e) {
-    setOpenMenu(e.currentTarget);
-  }
-
-  function handleCloseSettings() {
-    setOpenMenu(null);
-  }
-
   // Navigation Bar for standard user type
   if (role === "standard_user")
     return (
diff --git a/client/src/routes/merchant/MerchantReports.js b/client/src/routes/merchant/MerchantReports.js
index d785ab45..3037db03 100644
--- a/client/src/routes/merchant/MerchantReports.js
+++ b/client/src/routes/merchant/MerchantReports.js
@@ -85,8 +85,8 @@ const MerchantReports = () => {
       })
       .catch((err) => {
         console.error("Failed to fetch report data.");
-      }, [defaultSelectedPatientId]);
-  }
+      });
+  }, [defaultSelectedPatientId]);
 
   // Fetch the merchant reports
   useEffect(() => {

From 4906871802feeab2fd5e0278c74be712af9e5830 Mon Sep 17 00:00:00 2001
From: Luke Bradley <bralc003@mymail.unisa.edu.au>
Date: Mon, 25 May 2026 19:02:56 +0930
Subject: [PATCH 105/105] Fix user test not return race

---
 server/tests/routers/test_users.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/server/tests/routers/test_users.py b/server/tests/routers/test_users.py
index 87d06cc8..92f2e018 100644
--- a/server/tests/routers/test_users.py
+++ b/server/tests/routers/test_users.py
@@ -254,7 +254,8 @@ def test_merchant_get_patient_data_returns_correct_fields():
         "weight",
         "height",
         "gender",
-        "age"
+        "age",
+        "race"
     }
     assert data["gender"] == "Male"
     assert data["age"] == datetime.today().year - 1980 - \