Updated before Merging List

lib/core/api.dart

@@ -30,8 +30,8 @@ class API {
             log("NurseCallPatients: ${calledByNurse.toString()} ");
             log("patients: ${patients.toString()} ");
 
-            var isQueuePatients = calledByNurse.where((element) => element.isQueueNurse == false).toList();
+            var isQueuePatients = calledByNurse.where((element) => element.isQueueNurse == false || element.isQueueDr == false).toList();
-            calledByNurse.removeWhere((element) => element.isQueueNurse == false);
+            calledByNurse.removeWhere((element) => element.isQueueNurse == false || element.isQueueDr == false);
             // calledByNurse.sort((a, b) => a.callNo.compareTo(b.callNo));
 
             calledByNurse.addAll(isQueuePatients.toList());

lib/core/base/base_app_client.dart

@@ -1,5 +1,6 @@
 
 import 'dart:convert';
+import 'dart:developer';
 import 'dart:io' show Platform;
 import 'package:queuing_system/core/config/config.dart';
 import 'package:queuing_system/utils/Utils.dart';
@@ -32,7 +33,7 @@ class BaseAppClient {
         if (statusCode < 200 || statusCode >= 400) {
           onFailure(Utils.generateContactAdminMsg(), statusCode);
         } else {
-          print("Response: ${response.body.toString()}");
+          log("Response: ${response.body.toString()}");
           var parsed = json.decode(response.body.toString());
             onSuccess(parsed, statusCode);
         }

lib/home/home_screen.dart

@@ -78,7 +78,7 @@ class _MyHomePageState extends State<MyHomePage> {
   Widget build(BuildContext context) {
     return AppScaffold(
       appBar: AppHeader(),
-      body: content(),
+      body: dataContent(),
       bottomNavigationBar: Container(
         color: Colors.grey.withOpacity(0.1),
         height: Utils.getHeight(),
@@ -132,7 +132,7 @@ class _MyHomePageState extends State<MyHomePage> {
     // }
   }
 
-  Widget content() {
+  Widget dataContent() {
     // waitings.removeAt(0);
     // waitings = waitings.sublist(0,3);
     voiceCall();
@@ -173,16 +173,37 @@ class _MyHomePageState extends State<MyHomePage> {
   final AudioPlayer audioPlayer = AudioPlayer();
   int callFlag = 0;
 
+  bool isRequiredVoice({CallType callType, bool isQueueNurse, bool isQueueDr}) {
+    if (callType == CallType.DOCTOR && !isQueueDr) {
+      return true;
+    }
+    if (callType == CallType.NURSE && !isQueueNurse) {
+      return true;
+    }
+    return false;
+  }
+
   voiceCall() async {
     //DONE: After calling this voice call, we should delay for milliseconds that is given by API. After that we will check if there are more patients in isQueuePatients we will remove the patient from waiting list and then update the state
-
+    print("I am here");
     if (waitings.isNotEmpty) {
-      if (waitings.first.isToneReq) {
+      if (waitings.first.isToneReq &&
+          isRequiredVoice(
+            callType: waitings.first.getCallType(),
+            isQueueDr: waitings.first.isQueueDr,
+            isQueueNurse: waitings.first.isQueueNurse,
+          )) {
         audioPlayer.setAsset("assets/tones/call_tone.mp3");
         await audioPlayer.play();
-        await Future.delayed(const Duration(seconds: 2));
+        // await Future.delayed(const Duration(seconds: 2));
       }
-      if (waitings.first.isVoiceReq && voiceCaller == null) {
+      if (waitings.first.isVoiceReq &&
+          voiceCaller == null &&
+          isRequiredVoice(
+            callType: waitings.first.getCallType(),
+            isQueueDr: waitings.first.isQueueDr,
+            isQueueNurse: waitings.first.isQueueNurse,
+          )) {
         final postVoice = getCallTypeText(waitings.first);
         voiceCaller = CallByVoice(waitings.first.queueNo.trim().toString(), preVoice: "Ticket Number", postVoice: postVoice, lang: 'en');
         await voiceCaller.startCalling(waitings.first.queueNo.trim().toString() != waitings.first.callNoStr.trim().toString());
@@ -195,12 +216,12 @@ class _MyHomePageState extends State<MyHomePage> {
           isQueuePatients.removeAt(0);
         }
         if (waitings.isNotEmpty) {
-          Tickets ticket = waitings.elementAt(0);
+          // Tickets ticket = waitings.elementAt(0);
-          waitings.removeAt(0);
+          // waitings.removeAt(0);
-          waitings.add(ticket);
+          // waitings.add(ticket);
         }
         if (isQueuePatients.isNotEmpty) {
-          setState(() {});
+          // setState(() {});
         }
       });
     } else {

lib/home/home_screen_components.dart

@@ -26,10 +26,10 @@ Widget priorityTicketsWithSideList(List<Tickets> tickets) {
   final otherTickets = tickets.sublist(3, tickets.length);
   return Row(
     children: [
-      Expanded(flex: 4, child: PriorityTickets(priorityTickets)),
+      Expanded(flex: 7, child: PriorityTickets(priorityTickets)),
       Container(color: Colors.grey.withOpacity(0.1), width: 10, margin: const EdgeInsets.symmetric(horizontal: 10, vertical: 50)),
       Expanded(
-        flex: 4,
+        flex: 5,
         child: ListView.builder(
           padding: const EdgeInsets.symmetric(horizontal: 0, vertical: 50),
           itemCount: otherTickets.length,
@@ -42,7 +42,7 @@ Widget priorityTicketsWithSideList(List<Tickets> tickets) {
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
                   SizedBox(
-                    width: SizeConfig.getWidthMultiplier() * 21,
+                    width: SizeConfig.getWidthMultiplier() * 19,
                     child: AppText(
                       itm.queueNo.toString(),
                       letterSpacing: -2,
@@ -56,7 +56,7 @@ Widget priorityTicketsWithSideList(List<Tickets> tickets) {
                     crossAxisAlignment: CrossAxisAlignment.end,
                     children: [
                       SizedBox(
-                        width: SizeConfig.getWidthMultiplier() * 3.3,
+                        width: SizeConfig.getWidthMultiplier() * 3,
                         child: itm.getCallType().icon(SizeConfig.getHeightMultiplier() * 2.5),
                       ),
                       const SizedBox(width: 10),
@@ -66,7 +66,7 @@ Widget priorityTicketsWithSideList(List<Tickets> tickets) {
                           itm.getCallType().message('en'),
                           color: itm.getCallType().color(),
                           letterSpacing: -1.5,
-                          fontSize: SizeConfig.getWidthMultiplier() * 3.3,
+                          fontSize: SizeConfig.getWidthMultiplier() * 3,
                           fontWeight: FontWeight.w600,
                           fontHeight: 0.5,
                         ),