From 879bb7c1671b46f884f0021b12ea9c92824e0453 Mon Sep 17 00:00:00 2001
From: FaizHashmiCS22 <faizhashmi614@gmail.com>
Date: Wed, 25 Dec 2024 16:59:29 +0300
Subject: [PATCH] asked Zahoor to make models same

---
 lib/models/global_config_model.dart           |  4 +-
 lib/models/room_ticket_model.dart             | 50 +++++++++++++++++++
 lib/models/ticket_model.dart                  |  2 +-
 .../main_queue_screen/main_queue_screen.dart  |  7 ++-
 4 files changed, 56 insertions(+), 7 deletions(-)
 create mode 100644 lib/models/room_ticket_model.dart

diff --git a/lib/models/global_config_model.dart b/lib/models/global_config_model.dart
index 646fdb8..34d6db9 100644
--- a/lib/models/global_config_model.dart
+++ b/lib/models/global_config_model.dart
@@ -166,8 +166,8 @@ class GlobalConfigurationsModel {
     qTypeEnum = (json['qType'] as int).toQTypeEnum();
     screenTypeEnum = (json['screenType'] as int).toScreenTypeEnum();
     projectID = json['projectID'];
-    projectLatitude = json['projectLatitude'];
-    projectLongitude = json['projectLongitude'];
+    projectLatitude = json['projectLatitude'] == 0 ? 0.0 : json['projectLatitude'];
+    projectLongitude = json['projectLongitude'] == 0 ? 0.0 : json['projectLongitude'];
     cityKey = json['cityKey'];
   }
 }
diff --git a/lib/models/room_ticket_model.dart b/lib/models/room_ticket_model.dart
new file mode 100644
index 0000000..59a5864
--- /dev/null
+++ b/lib/models/room_ticket_model.dart
@@ -0,0 +1,50 @@
+class RoomTicketModel {
+  int? rowID;
+  int? id;
+  int? floorID;
+  int? buildingID;
+  int? projectID;
+  String? roomName;
+  String? roomNameN;
+  int? roomNo;
+  String? roomQScreenIP;
+  bool? isActive;
+  int? createdBy;
+  String? createdOn;
+  String? editedBy;
+  String? editedOn;
+
+  RoomTicketModel({
+    this.rowID,
+    this.id,
+    this.floorID,
+    this.buildingID,
+    this.projectID,
+    this.roomName,
+    this.roomNameN,
+    this.roomNo,
+    this.roomQScreenIP,
+    this.isActive,
+    this.createdBy,
+    this.createdOn,
+    this.editedBy,
+    this.editedOn,
+  });
+
+  RoomTicketModel.fromJson(Map<String, dynamic> json) {
+    rowID = json['rowID'];
+    id = json['id'];
+    floorID = json['floorID'];
+    buildingID = json['buildingID'];
+    projectID = json['projectID'];
+    roomName = json['roomName'];
+    roomNameN = json['roomNameN'];
+    roomNo = json['roomNo'];
+    roomQScreenIP = json['roomQScreenIP'];
+    isActive = json['isActive'];
+    createdBy = json['createdBy'];
+    createdOn = json['createdOn'];
+    editedBy = json['editedBy'];
+    editedOn = json['editedOn'];
+  }
+}
diff --git a/lib/models/ticket_model.dart b/lib/models/ticket_model.dart
index bdab73e..66214d2 100644
--- a/lib/models/ticket_model.dart
+++ b/lib/models/ticket_model.dart
@@ -88,7 +88,7 @@ class TicketData {
     patientEmail = json['patientEmail'];
     preferredLang = (json['preferredLang'] != null && json['preferredLang'].trim() != "" )? int.parse(json['preferredLang']) : 1;
     patientGender = json['patientGender'] ?? 1;
-    roomNo = json['roomNo'];
+    roomNo = json['roomNo'].toString();
     isActive = json['isActive'];
     createdBy = json['createdBy'];
     editedBy = json['editedBy'];
diff --git a/lib/views/main_queue_screen/main_queue_screen.dart b/lib/views/main_queue_screen/main_queue_screen.dart
index 81097f5..aebc37b 100644
--- a/lib/views/main_queue_screen/main_queue_screen.dart
+++ b/lib/views/main_queue_screen/main_queue_screen.dart
@@ -133,14 +133,13 @@ class MainQueueScreen extends StatelessWidget {
       builder: (BuildContext context, ScreenConfigViewModel screenConfigViewModel, QueuingViewModel queuingViewModel, Widget? child) {
         Widget widget = const SizedBox();
         // queuingViewModel.voiceCallTicket(ticketData: queuingViewModel.currentTickets.first.ticketModel);
-
-        if (screenConfigViewModel.globalConfigurationsModel.screenTypeEnum == ScreenTypeEnum.roomLevelScreen) {
+        if (queuingViewModel.currentTickets.isEmpty) { 
+          widget = noPatientInQueue();
+        } else if (screenConfigViewModel.globalConfigurationsModel.screenTypeEnum == ScreenTypeEnum.roomLevelScreen) {
           widget = PriorityTickets(
             tickets: [queuingViewModel.currentTickets.first],
             globalConfigurationsModel: screenConfigViewModel.globalConfigurationsModel,
           );
-        } else if (queuingViewModel.currentTickets.isEmpty) {
-          widget = noPatientInQueue();
         } else if (queuingViewModel.currentTickets.length > AppConstants.thresholdForListUI) {
           widget = PriorityTicketsSidelist(
             tickets: queuingViewModel.currentTickets,