on back confirmation dialog added on gas refill, task and asset transfer

design_3.0_task_module_new
Sikander Saleem 6 months ago
parent 5b3d746b14
commit 50fb07b504

@ -479,7 +479,10 @@ class _UpdateDeviceTransferState extends State<UpdateDeviceTransfer> {
: (!(_formModel.receiverMachineStatusName?.toLowerCase().contains("close") ?? false) || !(_formModel.receiverMachineStatusName?.toLowerCase().contains("complete") ?? false));
return Scaffold(
appBar: DefaultAppBar(title: context.translation.transferAsset),
appBar: DefaultAppBar(title: context.translation.transferAsset,
onWillPopScope: () {
_update(status: 0);
},),
key: _scaffoldKey,
body: SafeArea(
child: LoadingManager(
@ -555,7 +558,11 @@ class _UpdateDeviceTransferState extends State<UpdateDeviceTransfer> {
),
),
),
);
).handlePopScope(
cxt: context,
onSave: () {
_update(status: 0);
});
}
void updateTimer({TimerModel? timer}) {

@ -80,8 +80,7 @@ class _GasRefillFormState extends State<GasRefillForm> {
if (widget.gasRefillModel != null) {
_formModel.fromGasRefillModel(widget.gasRefillModel!);
totalWorkingHours =
_formModel.gasRefillTimers?.fold(0.0, (sum, item) => (sum ?? 0) + DateTime.parse(item.endDate!).difference(DateTime.parse(item.startDate!)).inSeconds) ?? 0;
totalWorkingHours = _formModel.gasRefillTimers?.fold(0.0, (sum, item) => (sum ?? 0) + DateTime.parse(item.endDate!).difference(DateTime.parse(item.startDate!)).inSeconds) ?? 0;
_commentController.text = _formModel.techComment ?? "";
try {
_deliveredQuantity = deliveredQuantity.singleWhere((element) => element.value == _formModel.gasRefillDetails![0].deliverdQty);
@ -130,8 +129,8 @@ class _GasRefillFormState extends State<GasRefillForm> {
});
_formModel.gasRefillAttachments = [];
for (var item in _attachments) {
_formModel.gasRefillAttachments
?.add(GasRefillAttachments(id: 0,gasRefillId: _formModel.id??0, attachmentName: ServiceRequestUtils.isLocalUrl(item.path) ? "${item.path.split("/").last}|${base64Encode(item.readAsBytesSync())}" : item.path));
_formModel.gasRefillAttachments?.add(GasRefillAttachments(
id: 0, gasRefillId: _formModel.id ?? 0, attachmentName: ServiceRequestUtils.isLocalUrl(item.path) ? "${item.path.split("/").last}|${base64Encode(item.readAsBytesSync())}" : item.path));
}
await _gasRefillProvider?.updateGasRefill(status: status, model: _formModel).whenComplete(() {
if (status == 1) {
@ -190,7 +189,12 @@ class _GasRefillFormState extends State<GasRefillForm> {
double totalWorkingHours = _formModel.gasRefillTimers?.fold(0.0, (sum, item) => (sum ?? 0) + DateTime.parse(item.endDate!).difference(DateTime.parse(item.startDate!)).inSeconds) ?? 0;
return Scaffold(
appBar: DefaultAppBar(title: context.translation.gasRefill),
appBar: DefaultAppBar(
title: context.translation.gasRefill,
onWillPopScope: () {
_onSubmit(context, 0);
},
),
key: _scaffoldKey,
body: Form(
key: _formKey,
@ -341,7 +345,11 @@ class _GasRefillFormState extends State<GasRefillForm> {
)),
),
),
);
).handlePopScope(
cxt: context,
onSave: () {
_onSubmit(context, 0);
});
}
Widget _timerWidget(BuildContext context, double totalWorkingHours) {

@ -171,21 +171,11 @@ class _TaskRequestDetailsViewState extends State<TaskRequestDetailsView> {
);
}
// Widget linkWithAssetWidget({required TaskData taskModel}) {
// return Column(
// crossAxisAlignment: CrossAxisAlignment.start,
// children: [
// // assetDetails(),
// ],
// );
// }
Widget linkWithLocationWidget({required TaskData taskModel}) {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [
const Divider().defaultStyle(context),
Text(
"Location Details".addTranslation,
style: AppTextStyles.heading4.copyWith(color: context.isDark ? AppColor.neutral30 : AppColor.neutral50),

@ -84,7 +84,10 @@ class _TaskRequestFormState extends State<TaskRequestForm> {
Widget build(BuildContext context) {
return Consumer<TaskRequestProvider>(builder: (context, taskProvider, child) {
return Scaffold(
appBar: DefaultAppBar(title: context.translation.taskRequest),
appBar: DefaultAppBar(title: context.translation.taskRequest,
onWillPopScope: () {
_updateTask(context: context, status: 0);
},),
key: _scaffoldKey,
body: taskProvider.isLoading
? const ALoading()
@ -164,7 +167,11 @@ class _TaskRequestFormState extends State<TaskRequestForm> {
),
)
: NoDataFound(message: context.translation.noDataFound).center,
);
).handlePopScope(
cxt: context,
onSave: () {
_updateTask(context: context, status: 0);
});
});
}

Loading…
Cancel
Save