added isRoomNoRequired

faiz_kiosk
FaizHashmiCS22 6 months ago
parent 5a3436f4a5
commit d6705f198a

@ -96,7 +96,7 @@ class AppConstants {
} }
class ApiConstants { 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 baseUrlHub = '$baseUrl/PatientCallingHub';
static String baseUrlApi = '$baseUrl/api'; static String baseUrlApi = '$baseUrl/api';
static String baseUrlApiGen = '$baseUrl/api/Gen'; static String baseUrlApiGen = '$baseUrl/api/Gen';

@ -26,6 +26,7 @@ class GlobalConfigurationsModel {
String postVoiceText = "Please Visit Counter"; String postVoiceText = "Please Visit Counter";
String? roomText; String? roomText;
int? roomNo; int? roomNo;
bool? isRoomNoRequired;
String? counterText; String? counterText;
String? queueNoText; String? queueNoText;
String? callForText; String? callForText;
@ -84,6 +85,7 @@ class GlobalConfigurationsModel {
this.postVoiceText = "Please Visit Counter", this.postVoiceText = "Please Visit Counter",
this.roomText, this.roomText,
this.roomNo, this.roomNo,
this.isRoomNoRequired = true,
this.counterText, this.counterText,
this.queueNoText, this.queueNoText,
this.callForText, this.callForText,
@ -144,6 +146,7 @@ class GlobalConfigurationsModel {
counterText = json['counterText']; counterText = json['counterText'];
roomText = json['roomText']; roomText = json['roomText'];
roomNo = json['roomNo']; roomNo = json['roomNo'];
isRoomNoRequired = json['isRoomNoRequired'] ?? true;
queueNoText = json['queueNoText']; queueNoText = json['queueNoText'];
callForText = json['callForText']; callForText = json['callForText'];
currentServeText = json['currentServeText']; currentServeText = json['currentServeText'];

@ -122,18 +122,18 @@ int getFlexForScreenTypes(ScreenConfigViewModel screenConfigVM) {
return flex; return flex;
} }
Widget counterNoText(int counterNo) { Widget counterNoText({required int counterNo, required bool isRoomNoRequired, required String roomText}) {
return AppText( return AppText(
"${AppStrings.counterNo}$counterNo", "$roomText $counterNo",
fontFamily: AppStrings.fontNamePoppins, fontFamily: AppStrings.fontNamePoppins,
textAlign: TextAlign.center, textAlign: TextAlign.center,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
color: Colors.transparent, color: isRoomNoRequired ? Colors.black : Colors.transparent,
fontSize: SizeConfig.getWidthMultiplier() * 8, 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( Widget noPatientText = Center(
child: AppText( child: AppText(
text, text,
@ -145,7 +145,15 @@ Widget noPatientInQueue({required String text, required String fontName, require
if (isForRoomLevel) { if (isForRoomLevel) {
return Column( return Column(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [counterNoText(counterNo), noPatientText, const SizedBox.shrink()], children: [
counterNoText(
counterNo: counterNo,
roomText: roomText,
isRoomNoRequired: isRoomNoRequired,
),
noPatientText,
const SizedBox.shrink()
],
); );
} else { } else {
return noPatientText; return noPatientText;

@ -24,11 +24,11 @@ class AppHeader extends StatelessWidget implements PreferredSizeWidget {
children: [ children: [
AppText( AppText(
"Network Status :", "Network Status :",
fontSize: SizeConfig.getWidthMultiplier() * 2.6, fontSize: SizeConfig.getWidthMultiplier() * 2,
), ),
AppText( AppText(
" ${screenConfigVM.isInternetConnected ? "Connected" : "Disconnected"}", " ${screenConfigVM.isInternetConnected ? "Connected" : "Disconnected"}",
fontSize: SizeConfig.getWidthMultiplier() * 3, fontSize: SizeConfig.getWidthMultiplier() * 2.5,
color: screenConfigVM.isInternetConnected ? AppColors.greenColor : AppColors.redColor, color: screenConfigVM.isInternetConnected ? AppColors.greenColor : AppColors.redColor,
), ),
], ],
@ -39,11 +39,11 @@ class AppHeader extends StatelessWidget implements PreferredSizeWidget {
children: [ children: [
AppText( AppText(
"Hub Status :", "Hub Status :",
fontSize: SizeConfig.getWidthMultiplier() * 2.6, fontSize: SizeConfig.getWidthMultiplier() * 2,
), ),
AppText( AppText(
" ${screenConfigVM.isHubConnected ? "Connected" : "Disconnected"}", " ${screenConfigVM.isHubConnected ? "Connected" : "Disconnected"}",
fontSize: SizeConfig.getWidthMultiplier() * 3, fontSize: SizeConfig.getWidthMultiplier() * 2.5,
color: screenConfigVM.isHubConnected ? AppColors.greenColor : AppColors.redColor, color: screenConfigVM.isHubConnected ? AppColors.greenColor : AppColors.redColor,
), ),
], ],

@ -34,7 +34,14 @@ class MainQueueScreen extends StatelessWidget {
} }
if (queuingViewModel.currentTickets.isEmpty) { if (queuingViewModel.currentTickets.isEmpty) {
bool isForRoomLevel = screenConfigViewModel.globalConfigurationsModel.screenTypeEnum == ScreenTypeEnum.roomLevelScreen; 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) { } else if (screenConfigViewModel.globalConfigurationsModel.screenTypeEnum == ScreenTypeEnum.roomLevelScreen) {
widget = Row( widget = Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
@ -43,7 +50,11 @@ class MainQueueScreen extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
counterNoText(screenConfigViewModel.globalConfigurationsModel.roomNo ?? 0), counterNoText(
counterNo: screenConfigViewModel.globalConfigurationsModel.roomNo ?? 0,
roomText: screenConfigViewModel.globalConfigurationsModel.roomText ?? AppStrings.counterNo,
isRoomNoRequired: screenConfigViewModel.globalConfigurationsModel.isRoomNoRequired ?? true,
),
PriorityTickets( PriorityTickets(
tickets: [queuingViewModel.currentTickets.first], tickets: [queuingViewModel.currentTickets.first],
globalConfigurationsModel: screenConfigViewModel.globalConfigurationsModel, globalConfigurationsModel: screenConfigViewModel.globalConfigurationsModel,

Loading…
Cancel
Save