From 5607600369b44dd6c55bed843a47c1b85e248b27 Mon Sep 17 00:00:00 2001
From: haroon amjad <amjad.haroon@cloudsolutions.com.sa>
Date: Mon, 28 Sep 2026 16:06:27 +0300
Subject: [PATCH] Updates

---
 lib/core/api/api_client.dart         |  2 +-
 lib/core/app_state.dart              |  4 ++--
 lib/core/utils/date_util.dart        | 20 ++++++++++----------
 lib/core/utils/utils.dart            |  2 +-
 lib/features/lab/lab_view_model.dart |  8 +++++---
 5 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/lib/core/api/api_client.dart b/lib/core/api/api_client.dart
index 00eebb34..7a6096bc 100644
--- a/lib/core/api/api_client.dart
+++ b/lib/core/api/api_client.dart
@@ -209,7 +209,7 @@ class ApiClientImp implements ApiClient {
           body['TokenID'] = "@dm!n";
         }
 
-        body['TokenID'] = "@dm!n";
+        // body['TokenID'] = "@dm!n";
         // body['PatientID'] = 7000792;
         // body['PatientID'] = 53320;
         // body['PatientTypeID'] = 1;
diff --git a/lib/core/app_state.dart b/lib/core/app_state.dart
index 78432b23..c420a0c3 100644
--- a/lib/core/app_state.dart
+++ b/lib/core/app_state.dart
@@ -57,8 +57,8 @@ class AppState {
   }
 
   void setIsMyFatoorahEnabled(bool value) {
-    // isMyFatoorahEnabled = value;
-    isMyFatoorahEnabled = true;
+    isMyFatoorahEnabled = value;
+    // isMyFatoorahEnabled = true;
   }
 
   void setIsPayfortHostedPageEnabled(bool value) {
diff --git a/lib/core/utils/date_util.dart b/lib/core/utils/date_util.dart
index 7510786d..b57f912d 100644
--- a/lib/core/utils/date_util.dart
+++ b/lib/core/utils/date_util.dart
@@ -28,21 +28,21 @@ class DateUtil {
       const end = "+0300)";
       final startIndex = date.indexOf(start);
       final endIndex = date.indexOf(end, startIndex + start.length);
-      if (projectId == 2 || projectId == 3) {
-        return DateTime.fromMillisecondsSinceEpoch(
-                int.parse(
-                  date.substring(startIndex + start.length, endIndex),
-                ),
-                isUtc: true)
-            .add(Duration(hours: 4));
-      } else {
-        return DateTime.fromMillisecondsSinceEpoch(
+      // if (projectId == 2 || projectId == 3 || projectId == 4) {
+      //   return DateTime.fromMillisecondsSinceEpoch(
+      //           int.parse(
+      //             date.substring(startIndex + start.length, endIndex),
+      //           ),
+      //           isUtc: true)
+      //       .add(Duration(hours: 4));
+      // } else {
+      return DateTime.fromMillisecondsSinceEpoch(
               int.parse(
                 date.substring(startIndex + start.length, endIndex),
               ),
               isUtc: true)
           .add(Duration(hours: 3));
-      }
+      // }
     } else {
       return DateTime.now();
     }
diff --git a/lib/core/utils/utils.dart b/lib/core/utils/utils.dart
index 0d09a716..0b5049cf 100644
--- a/lib/core/utils/utils.dart
+++ b/lib/core/utils/utils.dart
@@ -135,7 +135,7 @@ class Utils {
   static String convertStringToDateTime(String dateTimeString) {
     String timeString = dateTimeString;
     // Parse the time string using DateFormat
-    DateFormat format = DateFormat.Hms(["en-US"]); // 'Hms' = 'HH:mm:ss'
+    DateFormat format = DateFormat.Hms("en-US"); // 'Hms' = 'HH:mm:ss'
     DateTime time = format.parse(timeString);
 
     DateTime now = DateTime.now();
diff --git a/lib/features/lab/lab_view_model.dart b/lib/features/lab/lab_view_model.dart
index d7f5bb62..90ceacfe 100644
--- a/lib/features/lab/lab_view_model.dart
+++ b/lib/features/lab/lab_view_model.dart
@@ -363,6 +363,7 @@ class LabViewModel extends ChangeNotifier {
             labOrder.doctorName = doctorName;
             labOrder.projectName = projectName;
             labOrder.orderDate = appointmentDate;
+            // labOrder.testDetails = apiResponse.data;
 
             currentlySelectedPatientOrder = labOrder;
 
@@ -881,8 +882,9 @@ class LabViewModel extends ChangeNotifier {
     List<Map<String, dynamic>> results = [];
     Map<String, dynamic> orderData = {"order_date": labOrder.orderDate ?? "", "clinic": labOrder.clinicDescription ?? "", "doctor": labOrder.doctorName ?? "", "results": []};
     List<Map<String, dynamic>> testResults = [];
-    if (labOrder.testDetails != null && labOrder.testDetails!.isNotEmpty) {
-      for (var testDetail in labOrder.testDetails!) {
+    // if (labOrder.testDetails != null && labOrder.testDetails!.isNotEmpty) {
+    //   for (var testDetail in labOrder.testDetails!) {
+      for (var testDetail in mainLabResultsByHospitalsList!) {
         LabResult? matchingResult =
             mainLabResultsByHospitalsList.firstWhere((labResult) => labResult.testCode == testDetail.testCode || labResult.description == testDetail.description, orElse: () => LabResult());
         testResults.add({
@@ -893,7 +895,7 @@ class LabViewModel extends ChangeNotifier {
           "flag": matchingResult.calculatedResultFlag ?? "N"
         });
       }
-    }
+    // }
     orderData["results"] = testResults;
     results.add(orderData);
 
-- 
2.30.2