diff --git a/lib/view_models/queuing_view_model.dart b/lib/view_models/queuing_view_model.dart index c6a0980..e4fd7d9 100644 --- a/lib/view_models/queuing_view_model.dart +++ b/lib/view_models/queuing_view_model.dart @@ -54,7 +54,8 @@ class QueuingViewModel extends ChangeNotifier { } Future onHubConfigCall(var response) async { - log("onHubConnected: $response"); + log("onHubConfigCall: $response"); + // TODO: // ScreenConfigViewModel screenConfigViewModel = getIt.get(); // screenConfigViewModel.updateGlobalConfigurationsModel(true); } diff --git a/lib/views/main_queue_screen/main_queue_screen.dart b/lib/views/main_queue_screen/main_queue_screen.dart index ff488f5..ec809b5 100644 --- a/lib/views/main_queue_screen/main_queue_screen.dart +++ b/lib/views/main_queue_screen/main_queue_screen.dart @@ -134,7 +134,7 @@ class MainQueueScreen extends StatelessWidget { Widget widget = const SizedBox(); // queuingViewModel.voiceCallTicket(ticketData: queuingViewModel.currentTickets.first.ticketModel); if (queuingViewModel.currentTickets.isEmpty) { - screenConfigViewModel.createAutoTickets(); + // screenConfigViewModel.createAutoTickets(); widget = noPatientInQueue(); } else if (screenConfigViewModel.globalConfigurationsModel.screenTypeEnum == ScreenTypeEnum.roomLevelScreen) { widget = PriorityTickets( @@ -179,30 +179,35 @@ class MainQueueScreen extends StatelessWidget { } Widget getBody({required BuildContext context}) { - return Consumer(builder: ( - BuildContext context, - ScreenConfigViewModel screenConfigVM, - Widget? child, - ) { - return Column( - children: [ - Expanded( - flex: getFlexForScreenTypes(screenConfigVM), - child: Padding( - padding: const EdgeInsets.symmetric(horizontal: 20), - child: Row( - children: [ - getWeatherWidget(screenConfigVM), - const SizedBox(width: 20), - getPrayerWidget(screenConfigVM), - ], - )), - ), - const SizedBox(height: 12), - Expanded(flex: 10, child: dataContent(context: context)), - ], - ); - }); + return Consumer( + builder: ( + BuildContext context, + ScreenConfigViewModel screenConfigVM, + Widget? child, + ) { + return Column( + children: [ + Expanded( + flex: getFlexForScreenTypes(screenConfigVM), + child: Padding( + padding: const EdgeInsets.symmetric(horizontal: 20), + child: Row( + children: [ + getWeatherWidget(screenConfigVM), + const SizedBox(width: 20), + getPrayerWidget(screenConfigVM), + ], + )), + ), + const SizedBox(height: 12), + Expanded(flex: 10, child: dataContent(context: context)), + if (!screenConfigVM.globalConfigurationsModel.isWeatherReq && !screenConfigVM.globalConfigurationsModel.isPrayerTimeReq) ...[ + const SizedBox(height: 100), + ], + ], + ); + }, + ); } @override