From 67a224f60adf12c8b33e4ab998a5483a491fe558 Mon Sep 17 00:00:00 2001 From: zaid_daoud Date: Sun, 26 Nov 2023 12:04:26 +0300 Subject: [PATCH] fix timer issue on update transfer asset & update gas refill --- .../providers/api/asset_transfer_provider.dart | 4 ++-- lib/controllers/providers/api/gas_refill_provider.dart | 2 +- lib/models/device/asset_transfer.dart | 4 ++-- .../land_page/my_request/all_requests_search_page.dart | 8 ++++++++ 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/lib/controllers/providers/api/asset_transfer_provider.dart b/lib/controllers/providers/api/asset_transfer_provider.dart index bab4ce25..8b5099cb 100644 --- a/lib/controllers/providers/api/asset_transfer_provider.dart +++ b/lib/controllers/providers/api/asset_transfer_provider.dart @@ -154,10 +154,10 @@ class AssetTransferProvider extends ChangeNotifier { showDialog(context: context, barrierDismissible: false, builder: (context) => const AppLazyLoading()); assetTransfer.receiverStartDate = assetTransfer.receiverTimer?.startAt?.toIso8601String(); assetTransfer.receiverEndDate = assetTransfer.receiverTimer?.endAt?.toIso8601String(); - assetTransfer.receiverWorkingHours = (((assetTransfer.receiverTimer?.durationInSecond ?? 0) * 60) * 60).toStringAsFixed(2); + assetTransfer.receiverWorkingHours = (((assetTransfer.receiverTimer?.durationInSecond ?? 0) / 60) / 60).toStringAsFixed(2); assetTransfer.senderStartDate = assetTransfer.senderTimer?.startAt?.toIso8601String(); assetTransfer.senderEndDate = assetTransfer.senderTimer?.endAt?.toIso8601String(); - assetTransfer.senderWorkingHours = (((assetTransfer.senderTimer?.durationInSecond ?? 0) * 60) * 60).toStringAsFixed(2); + assetTransfer.senderWorkingHours = (((assetTransfer.senderTimer?.durationInSecond ?? 0) / 60) / 60).toStringAsFixed(2); response = await ApiManager.instance.put(URLs.updateDeviceTransfer, body: assetTransfer.toJson()); print(response.body); diff --git a/lib/controllers/providers/api/gas_refill_provider.dart b/lib/controllers/providers/api/gas_refill_provider.dart index c048fd35..8f2668b5 100644 --- a/lib/controllers/providers/api/gas_refill_provider.dart +++ b/lib/controllers/providers/api/gas_refill_provider.dart @@ -153,7 +153,7 @@ class GasRefillProvider extends ChangeNotifier { if (newModel.timer?.endAt != null) "endDate": newModel.timer.endAt.toIso8601String(), if (newModel.timer?.endAt != null) "endTime": newModel.timer.endAt.toIso8601String(), // "workingHours": ((endDate?.difference(startDate)?.inMinutes ?? 0) / 60), - 'workingHours': newModel.timer.durationInSecond != null ? newModel.timer.durationInSecond * 60 * 60 : newModel.workingHours, + 'workingHours': newModel.timer.durationInSecond != null ? newModel.timer.durationInSecond / 60 / 60 : newModel.workingHours, "assignedEmployee": oldModel?.assignedEmployee?.id == null ? null : oldModel?.assignedEmployee?.toJson(), "site": hospital?.toMap(), "building": building?.toJson(includeFloors: false), diff --git a/lib/models/device/asset_transfer.dart b/lib/models/device/asset_transfer.dart index 9e376f25..a50592eb 100644 --- a/lib/models/device/asset_transfer.dart +++ b/lib/models/device/asset_transfer.dart @@ -108,8 +108,8 @@ class AssetTransfer { receiverTravelingHours = json['receiverTravelingHours']; receiverEngSignature = json['receiverEngSignature']; try { - receiverTimer = TimerModel(startAt: DateTime.tryParse(receiverStartDate ?? ""), endAt: DateTime.tryParse(receiverEndDate)); - senderTimer = TimerModel(startAt: DateTime.tryParse(senderStartDate ?? ""), endAt: DateTime.tryParse(senderEndDate)); + receiverTimer = TimerModel(startAt: DateTime.tryParse(receiverStartDate ?? ""), endAt: DateTime.tryParse(receiverEndDate ?? "")); + senderTimer = TimerModel(startAt: DateTime.tryParse(senderStartDate ?? ""), endAt: DateTime.tryParse(senderEndDate ?? "")); if (receiverTimer.endAt != null && receiverTimer.startAt != null) { receiverTimer.durationInSecond = (receiverTimer.endAt.difference(receiverTimer.startAt))?.inSeconds; receiverWorkingHours = (((receiverTimer.durationInSecond ?? 0) / 60) / 60)?.toStringAsFixed(2); diff --git a/lib/new_views/pages/land_page/my_request/all_requests_search_page.dart b/lib/new_views/pages/land_page/my_request/all_requests_search_page.dart index 6bb45fea..720ec78d 100644 --- a/lib/new_views/pages/land_page/my_request/all_requests_search_page.dart +++ b/lib/new_views/pages/land_page/my_request/all_requests_search_page.dart @@ -56,6 +56,14 @@ class _AllRequestsSearchPageState extends State { } return Scaffold( + /// todo @zaid : FM asked if this button is doable + // floatingActionButton: FloatingActionButton( + // child: "qr".toSvgAsset(height: 32, fit: BoxFit.fitHeight, color: Theme.of(context).scaffoldBackgroundColor), + // onPressed: () async { + // String result = await Navigator.of(context).push(MaterialPageRoute(builder: (_) => const ScanQr())) as String; + // // _getDevice(result, isQr: true); + // }, + // ).paddingOnly(bottom: 75), appBar: DefaultAppBar( title: context.translation.search, actions: [