diff --git a/lib/core/config/config.dart b/lib/core/config/config.dart index 89bf1b2..d952eae 100644 --- a/lib/core/config/config.dart +++ b/lib/core/config/config.dart @@ -5,7 +5,8 @@ const ONLY_NUMBERS = "[0-9]"; const ONLY_LETTERS = "[a-zA-Z &'\"]"; const ONLY_DATE = "[0-9/]"; // const BASE_URL = 'https://ms.hmg.com/nscapi'; // UAT -const BASE_URL = 'https://qline.hmg.com'; // LIVE +const BASE_URL = 'https://ms.hmg.com/nscapi2'; // UAT 2 Development DB +// const BASE_URL = 'https://qline.hmg.com'; // LIVE const apiKey = 'EE17D21C7943485D9780223CCE55DCE5'; // UAT // const BASE_URL = 'http://10.200.204.11:2222/Services/Nurses.svc/REST'; // const BASE_URL = 'https://hmgwebservices.com/'; diff --git a/lib/header/app_header.dart b/lib/header/app_header.dart index 884aee1..5fde76a 100644 --- a/lib/header/app_header.dart +++ b/lib/header/app_header.dart @@ -74,7 +74,7 @@ class AppHeader extends StatelessWidget implements PreferredSizeWidget { return Consumer( builder: (BuildContext context, AppProvider appProvider, Widget? child) { return Container( - height: 100, + height: 115, padding: const EdgeInsets.only(left: 20, right: 20), decoration: BoxDecoration(color: AppGlobal.vitalSignColor), child: Directionality( diff --git a/lib/home/app_provider.dart b/lib/home/app_provider.dart index 9da8e25..eeb3de8 100644 --- a/lib/home/app_provider.dart +++ b/lib/home/app_provider.dart @@ -98,7 +98,7 @@ class AppProvider extends ChangeNotifier { ); } - logger.i("here logger.ig: ${isQueuePatients.length}"); + logger.i("isQueuePatients: ${isQueuePatients.length}"); if (isQueuePatients.isEmpty) { isCallingInProgress = false; diff --git a/lib/home/priority_calls_components.dart b/lib/home/priority_calls_components.dart index f92f3c6..7d7619c 100644 --- a/lib/home/priority_calls_components.dart +++ b/lib/home/priority_calls_components.dart @@ -82,7 +82,7 @@ class TicketItem extends StatelessWidget { String getFormattedTicket(String ticketNo, bool isClinicAdded) { if (isClinicAdded) { var formattedString = ticketNo.split(" "); - return formattedString[0] + " " + formattedString[1]; + return "${formattedString[0]} ${formattedString[1]}"; } return ticketNo; } @@ -94,19 +94,21 @@ class TicketItem extends StatelessWidget { child: Column( crossAxisAlignment: CrossAxisAlignment.center, children: [ - BlinkText(getFormattedTicket(ticketNo, isClinicAdded), - style: TextStyle( - fontSize: SizeConfig.getWidthMultiplier() * 10, - letterSpacing: -1, - height: 0.5, - fontWeight: FontWeight.bold, - ), - beginColor: Colors.black, - endColor: blink ? Colors.black.withOpacity(0.1) : Colors.black, - // endColor: blink ? AppGlobal.appRedColor : Colors.black, - times: 0, - duration: const Duration(seconds: 1)), - const SizedBox(height: 13), + BlinkText( + getFormattedTicket(ticketNo, isClinicAdded), + style: TextStyle( + fontSize: SizeConfig.getWidthMultiplier() * 10, + letterSpacing: -1, + height: 0.5, + fontWeight: FontWeight.bold, + ), + beginColor: Colors.black, + endColor: blink ? Colors.black.withOpacity(0.1) : Colors.black, + // endColor: blink ? AppGlobal.appRedColor : Colors.black, + times: 0, + duration: const Duration(seconds: 1), + ), + const SizedBox(height: 25), Directionality( textDirection: callConfig.textDirection, child: Row( @@ -114,8 +116,8 @@ class TicketItem extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.center, children: [ Padding( - padding: EdgeInsets.only(bottom: callType == CallType.vitalSign ? 0 : 8), - child: callType.icon(SizeConfig.getHeightMultiplier() * 3), + padding: EdgeInsets.only(bottom: callType == CallType.vitalSign ? 8 : 8), + child: callType.icon(SizeConfig.getHeightMultiplier() * 2), ), const SizedBox(width: 13), AppText( @@ -160,7 +162,9 @@ Widget noPatientInQueue({required ScreenOrientationEnum screenOrientationEnum}) child: AppText( "Awaiting Patients Arrival", fontFamily: 'Poppins-SemiBold.ttf', - fontSize: (screenOrientationEnum == ScreenOrientationEnum.portraitDown || screenOrientationEnum == ScreenOrientationEnum.portraitUp) ? SizeConfig.getWidthMultiplier() * 9 : SizeConfig.getWidthMultiplier() * 7, + fontSize: (screenOrientationEnum == ScreenOrientationEnum.portraitDown || screenOrientationEnum == ScreenOrientationEnum.portraitUp) + ? SizeConfig.getWidthMultiplier() * 9 + : SizeConfig.getWidthMultiplier() * 7, ), ), ], @@ -356,5 +360,7 @@ Widget priorityTicketsWithSideList({required List tickets, r ), ) ]; - return (appProvider.currentScreenRotation == ScreenOrientationEnum.portraitUp || appProvider.currentScreenRotation == ScreenOrientationEnum.portraitDown) ? Row(children: children) : Column(children: children); + return (appProvider.currentScreenRotation == ScreenOrientationEnum.portraitUp || appProvider.currentScreenRotation == ScreenOrientationEnum.portraitDown) + ? Row(children: children) + : Column(children: children); } diff --git a/lib/main.dart b/lib/main.dart index d4d7486..9c2e947 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -20,7 +20,6 @@ Logger logger = Logger( )); void main() { - //TODO: WE HAVE TO UPDATE THIS BEFORE GOING LIVE. HttpOverrides.global = MyHttpOverrides(); WidgetsFlutterBinding.ensureInitialized(); WakelockPlus.enable(); @@ -50,7 +49,7 @@ class MyApp extends StatelessWidget { ], child: MaterialApp( showSemanticsDebugger: false, - title: 'Doctors App', + title: 'Qline Appointments', theme: ThemeData( primaryColor: Colors.grey, fontFamily: 'Poppins', diff --git a/lib/utils/call_by_voice.dart b/lib/utils/call_by_voice.dart index 2661e33..4a8bfae 100644 --- a/lib/utils/call_by_voice.dart +++ b/lib/utils/call_by_voice.dart @@ -58,7 +58,7 @@ class CallByVoice { flutterTts.setVolume(1.0); isVoiceActualCompletedGlobally = true; await flutterTts.awaitSpeakCompletion(true); - await flutterTts.speak(preVoice + " .. " + clinicName + " .. " + patientAlpha + " .. " + patientNumeric + " .. " + postVoice); + await flutterTts.speak("$preVoice .. $clinicName .. $patientAlpha .. $patientNumeric .. $postVoice"); return; } @@ -69,9 +69,9 @@ class CallByVoice { await flutterTts.awaitSpeakCompletion(true); // await flutterTts.speak(preVoice + " .. " + clinicName + " .. " + patientAlpha + " .. " + patientNumeric + " .. " + postVoice); - await flutterTts.speak(preVoice + " .. "); + await flutterTts.speak("$preVoice .. "); await flutterTts.setLanguage("en"); - await flutterTts.speak(clinicName + " .. " + patientAlpha + " .. " + patientNumeric + " .. "); + await flutterTts.speak("$clinicName .. $patientAlpha .. $patientNumeric .. "); await flutterTts.setLanguage(lang); isVoiceActualCompletedGlobally = true; await flutterTts.speak(postVoice); diff --git a/lib/utils/signalR_utils.dart b/lib/utils/signalR_utils.dart index cc2f82c..64586a5 100644 --- a/lib/utils/signalR_utils.dart +++ b/lib/utils/signalR_utils.dart @@ -43,7 +43,7 @@ class SignalRHelper { client: IOClient(HttpClient()..badCertificateCallback = (x, y, z) => true), //TODO: IT MUST BE WEB SOCKETS - transport: HttpTransportType.longPolling, + transport: HttpTransportType.webSockets, logging: (level, message) => log(message), )) .withAutomaticReconnect()