diff --git a/lib/constants/app_constants.dart b/lib/constants/app_constants.dart index 7a1ad0f..9124977 100644 --- a/lib/constants/app_constants.dart +++ b/lib/constants/app_constants.dart @@ -96,7 +96,7 @@ class AppConstants { } class ApiConstants { - static String baseUrl = 'https://ms.hmg.com/nscapi'; + static String baseUrl = 'https://ms.hmg.com/nscapi2'; static String baseUrlHub = '$baseUrl/PatientCallingHub'; static String baseUrlApi = '$baseUrl/api'; static String baseUrlApiGen = '$baseUrl/api/Gen'; diff --git a/lib/models/global_config_model.dart b/lib/models/global_config_model.dart index 790415d..de9fa46 100644 --- a/lib/models/global_config_model.dart +++ b/lib/models/global_config_model.dart @@ -26,6 +26,7 @@ class GlobalConfigurationsModel { String postVoiceText = "Please Visit Counter"; String? roomText; int? roomNo; + bool? isRoomNoRequired; String? counterText; String? queueNoText; String? callForText; @@ -84,6 +85,7 @@ class GlobalConfigurationsModel { this.postVoiceText = "Please Visit Counter", this.roomText, this.roomNo, + this.isRoomNoRequired = true, this.counterText, this.queueNoText, this.callForText, @@ -144,6 +146,7 @@ class GlobalConfigurationsModel { counterText = json['counterText']; roomText = json['roomText']; roomNo = json['roomNo']; + isRoomNoRequired = json['isRoomNoRequired'] ?? true; queueNoText = json['queueNoText']; callForText = json['callForText']; currentServeText = json['currentServeText']; diff --git a/lib/views/common_widgets/app_general_widgets.dart b/lib/views/common_widgets/app_general_widgets.dart index fcb0e90..61acca0 100644 --- a/lib/views/common_widgets/app_general_widgets.dart +++ b/lib/views/common_widgets/app_general_widgets.dart @@ -122,18 +122,18 @@ int getFlexForScreenTypes(ScreenConfigViewModel screenConfigVM) { return flex; } -Widget counterNoText(int counterNo) { +Widget counterNoText({required int counterNo, required bool isRoomNoRequired, required String roomText}) { return AppText( - "${AppStrings.counterNo}$counterNo", + "$roomText $counterNo", fontFamily: AppStrings.fontNamePoppins, textAlign: TextAlign.center, fontWeight: FontWeight.bold, - color: Colors.transparent, + color: isRoomNoRequired ? Colors.black : Colors.transparent, fontSize: SizeConfig.getWidthMultiplier() * 8, ); } -Widget noPatientInQueue({required String text, required String fontName, required bool isForRoomLevel, required int counterNo}) { +Widget noPatientInQueue({required String text, required String fontName, required String roomText, required bool isRoomNoRequired, required bool isForRoomLevel, required int counterNo}) { Widget noPatientText = Center( child: AppText( text, @@ -145,7 +145,15 @@ Widget noPatientInQueue({required String text, required String fontName, require if (isForRoomLevel) { return Column( mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [counterNoText(counterNo), noPatientText, const SizedBox.shrink()], + children: [ + counterNoText( + counterNo: counterNo, + roomText: roomText, + isRoomNoRequired: isRoomNoRequired, + ), + noPatientText, + const SizedBox.shrink() + ], ); } else { return noPatientText; diff --git a/lib/views/common_widgets/app_header.dart b/lib/views/common_widgets/app_header.dart index 5e77cda..cb2a28a 100644 --- a/lib/views/common_widgets/app_header.dart +++ b/lib/views/common_widgets/app_header.dart @@ -24,11 +24,11 @@ class AppHeader extends StatelessWidget implements PreferredSizeWidget { children: [ AppText( "Network Status :", - fontSize: SizeConfig.getWidthMultiplier() * 2.6, + fontSize: SizeConfig.getWidthMultiplier() * 2, ), AppText( " ${screenConfigVM.isInternetConnected ? "Connected" : "Disconnected"}", - fontSize: SizeConfig.getWidthMultiplier() * 3, + fontSize: SizeConfig.getWidthMultiplier() * 2.5, color: screenConfigVM.isInternetConnected ? AppColors.greenColor : AppColors.redColor, ), ], @@ -39,11 +39,11 @@ class AppHeader extends StatelessWidget implements PreferredSizeWidget { children: [ AppText( "Hub Status :", - fontSize: SizeConfig.getWidthMultiplier() * 2.6, + fontSize: SizeConfig.getWidthMultiplier() * 2, ), AppText( " ${screenConfigVM.isHubConnected ? "Connected" : "Disconnected"}", - fontSize: SizeConfig.getWidthMultiplier() * 3, + fontSize: SizeConfig.getWidthMultiplier() * 2.5, color: screenConfigVM.isHubConnected ? AppColors.greenColor : AppColors.redColor, ), ], diff --git a/lib/views/main_queue_screen/main_queue_screen.dart b/lib/views/main_queue_screen/main_queue_screen.dart index acc1035..3464a3c 100644 --- a/lib/views/main_queue_screen/main_queue_screen.dart +++ b/lib/views/main_queue_screen/main_queue_screen.dart @@ -34,7 +34,14 @@ class MainQueueScreen extends StatelessWidget { } if (queuingViewModel.currentTickets.isEmpty) { bool isForRoomLevel = screenConfigViewModel.globalConfigurationsModel.screenTypeEnum == ScreenTypeEnum.roomLevelScreen; - widget = noPatientInQueue(text: text, fontName: fontFamily, isForRoomLevel: isForRoomLevel, counterNo: screenConfigViewModel.globalConfigurationsModel.roomNo ?? 0); + widget = noPatientInQueue( + text: text, + fontName: fontFamily, + isForRoomLevel: isForRoomLevel, + isRoomNoRequired: screenConfigViewModel.globalConfigurationsModel.isRoomNoRequired ?? true, + counterNo: screenConfigViewModel.globalConfigurationsModel.roomNo ?? 0, + roomText: screenConfigViewModel.globalConfigurationsModel.roomText ?? AppStrings.counterNo, + ); } else if (screenConfigViewModel.globalConfigurationsModel.screenTypeEnum == ScreenTypeEnum.roomLevelScreen) { widget = Row( mainAxisAlignment: MainAxisAlignment.center, @@ -43,7 +50,11 @@ class MainQueueScreen extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.spaceBetween, crossAxisAlignment: CrossAxisAlignment.center, children: [ - counterNoText(screenConfigViewModel.globalConfigurationsModel.roomNo ?? 0), + counterNoText( + counterNo: screenConfigViewModel.globalConfigurationsModel.roomNo ?? 0, + roomText: screenConfigViewModel.globalConfigurationsModel.roomText ?? AppStrings.counterNo, + isRoomNoRequired: screenConfigViewModel.globalConfigurationsModel.isRoomNoRequired ?? true, + ), PriorityTickets( tickets: [queuingViewModel.currentTickets.first], globalConfigurationsModel: screenConfigViewModel.globalConfigurationsModel,