diff --git a/lib/extensions/widget_extensions.dart b/lib/extensions/widget_extensions.dart index dd971fd4..7d8dd44f 100644 --- a/lib/extensions/widget_extensions.dart +++ b/lib/extensions/widget_extensions.dart @@ -55,15 +55,15 @@ extension WidgetExtensions on Widget { Widget toExpanded({int flex = 1}) => Expanded(flex: flex, child: this); - Widget handlePopScope(BuildContext _cxt, VoidCallback onSave,) { - return PopScope( + Widget handlePopScope({required BuildContext cxt, required VoidCallback onSave, bool? showPopUp =true}) { + return showPopUp! ? PopScope( canPop: false, onPopInvokedWithResult: (didPop, result) { if (didPop) { return; } showDialog( - context: _cxt, + context: cxt, builder: (BuildContext cxt) => AcknowledgeWorkDialog( onSave: () => onSave(), onDiscard: () { @@ -72,7 +72,7 @@ extension WidgetExtensions on Widget { ), ); }, - child: this); + child: this):const SizedBox(); } Widget toShimmer({bool isShow = true, double radius = 20}) => isShow diff --git a/lib/service_request_latest/views/forms/maintenance_request/maintenance_request_main.dart b/lib/service_request_latest/views/forms/maintenance_request/maintenance_request_main.dart index ad0e5f01..3bc93f10 100644 --- a/lib/service_request_latest/views/forms/maintenance_request/maintenance_request_main.dart +++ b/lib/service_request_latest/views/forms/maintenance_request/maintenance_request_main.dart @@ -111,8 +111,8 @@ class _MaintenanceRequestFormState extends State with Si ), ], ), - ).handlePopScope(context, () { - requestDetailProvider.isReadOnlyRequest ? null : save(requestDetailProvider); + ).handlePopScope(cxt: context, showPopUp: !requestDetailProvider.isReadOnlyRequest, onSave: () { + save(requestDetailProvider); }); }); } diff --git a/lib/views/pages/user/ppm/ppm_work_order/recurrent_wo/recurrent_work_order_view.dart b/lib/views/pages/user/ppm/ppm_work_order/recurrent_wo/recurrent_work_order_view.dart index ef25b37b..93a67e1b 100644 --- a/lib/views/pages/user/ppm/ppm_work_order/recurrent_wo/recurrent_work_order_view.dart +++ b/lib/views/pages/user/ppm/ppm_work_order/recurrent_wo/recurrent_work_order_view.dart @@ -100,7 +100,7 @@ class _RecurrentWorkOrderViewState extends State { ], ) : NoDataFound(message: context.translation.noDataFound).center, - ).handlePopScope(context, () { + ).handlePopScope(cxt: context,onSave: () { _updateTask(context: context, status: 0); }); }); diff --git a/lib/views/pages/user/ppm/update_ppm/update_ppm.dart b/lib/views/pages/user/ppm/update_ppm/update_ppm.dart index a0fcbf30..9188e24c 100644 --- a/lib/views/pages/user/ppm/update_ppm/update_ppm.dart +++ b/lib/views/pages/user/ppm/update_ppm/update_ppm.dart @@ -251,7 +251,7 @@ class _UpdatePpmState extends State with TickerProviderStateMixin { ], ), ), - ).handlePopScope(context, () { + ).handlePopScope(cxt: context, showPopUp:!ppmProvider.isReadOnly ,onSave: () { _onSubmit(status: 0); }); }