From 9de9fb0e33d16778bac8ec6eccb6cad58c82ba73 Mon Sep 17 00:00:00 2001
From: yaso-meth <yasienmeth@gmail.com>
Date: Wed, 4 Sep 2024 16:23:14 +0200
Subject: [PATCH] Star out information if access expires

---
 .../builders/buildAccessRequestList.dart      | 10 +++++++--
 .../builders/buildPatientQueueList.dart       | 21 +++++++++++++------
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/Frontend/patient_manager/lib/components/builders/buildAccessRequestList.dart b/Frontend/patient_manager/lib/components/builders/buildAccessRequestList.dart
index fd710889..b852ca64 100644
--- a/Frontend/patient_manager/lib/components/builders/buildAccessRequestList.dart
+++ b/Frontend/patient_manager/lib/components/builders/buildAccessRequestList.dart
@@ -89,8 +89,14 @@ class _BuildPatientsListState extends State<BuildAccessRequestList> {
     String subtitle = "";
     subtitle += "Requestor: ${widget.accessRequests[index].Name}\n";
     //subtitle += "Business Type: ${widget.accessRequests[index].type}\n";
-    subtitle +=
-        "Access: ${widget.accessRequests[index].access.toUpperCase()}\n";
+    var nowDate = DateTime.now();
+    var expireyDate = DateTime.parse(widget.accessRequests[index].revoke_date);
+    if (expireyDate.isBefore(nowDate)) {
+      subtitle += "Access: EXPIRED\n";
+    } else {
+      subtitle +=
+          "Access: ${widget.accessRequests[index].access.toUpperCase()}\n";
+    }
     if (widget.accessRequests[index].revoke_date.contains("9999")) {
       subtitle += "Access Expiration date: NOT SET";
     } else {
diff --git a/Frontend/patient_manager/lib/components/builders/buildPatientQueueList.dart b/Frontend/patient_manager/lib/components/builders/buildPatientQueueList.dart
index 79c7e9e7..e8122b77 100644
--- a/Frontend/patient_manager/lib/components/builders/buildPatientQueueList.dart
+++ b/Frontend/patient_manager/lib/components/builders/buildPatientQueueList.dart
@@ -61,11 +61,15 @@ class _BuildPatientsListState extends State<BuildPatientQueueList> {
     String title =
         widget.patientQueue[index].date_time.split('T')[1].substring(0, 5);
     String subtitle = "";
+    var nowDate = DateTime.now();
+    var expireyDate = DateTime.parse(widget.patientQueue[index].revoke_date);
 
-    if (widget.patientQueue[index].access != "approved") {
-      subtitle +=
-          "Name: $fname $lname\nID No.: ${widget.patientQueue[index].id_no}\nMedical Aid No: ";
-      subtitle += "********";
+    if (widget.patientQueue[index].access != "approved" ||
+        expireyDate.isBefore(nowDate)) {
+      subtitle += "Name: $fname $lname\n";
+      subtitle += "ID No.: ${widget.patientQueue[index].id_no}\n";
+      subtitle += "Medical Aid No: ********";
+      //subtitle += "********";
     } else {
       subtitle +=
           "Name: ${widget.patientQueue[index].first_name} ${widget.patientQueue[index].last_name}\nID No.: ${widget.patientQueue[index].id_no}\nMedical Aid No: ";
@@ -77,8 +81,13 @@ class _BuildPatientsListState extends State<BuildPatientQueueList> {
         subtitle += widget.patientQueue[index].medical_aid_no;
       }
     }
-    subtitle +=
-        "\nAccess Request: ${widget.patientQueue[index].access.toUpperCase()}";
+    if (expireyDate.isBefore(nowDate)) {
+      subtitle += "\nAccess Request: EXPIRED";
+    } else {
+      subtitle +=
+          "\nAccess Request: ${widget.patientQueue[index].access.toUpperCase()}";
+    }
+
     subtitle +=
         "\nAccess Expiration date: ${widget.patientQueue[index].revoke_date.substring(0, 16).replaceAll("T", " ")}";
     return ListTile(