bug fixes

design_3.0_latest
WaseemAbbasi22 8 months ago
parent ab91baf216
commit 045c890a27

@ -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

@ -111,8 +111,8 @@ class _MaintenanceRequestFormState extends State<MaintenanceRequestForm> with Si
),
],
),
).handlePopScope(context, () {
requestDetailProvider.isReadOnlyRequest ? null : save(requestDetailProvider);
).handlePopScope(cxt: context, showPopUp: !requestDetailProvider.isReadOnlyRequest, onSave: () {
save(requestDetailProvider);
});
});
}

@ -100,7 +100,7 @@ class _RecurrentWorkOrderViewState extends State<RecurrentWorkOrderView> {
],
)
: NoDataFound(message: context.translation.noDataFound).center,
).handlePopScope(context, () {
).handlePopScope(cxt: context,onSave: () {
_updateTask(context: context, status: 0);
});
});

@ -251,7 +251,7 @@ class _UpdatePpmState extends State<UpdatePpm> with TickerProviderStateMixin {
],
),
),
).handlePopScope(context, () {
).handlePopScope(cxt: context, showPopUp:!ppmProvider.isReadOnly ,onSave: () {
_onSubmit(status: 0);
});
}

Loading…
Cancel
Save