From 6722e19cc5d93cff311124dade7661abe1c65ba9 Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Sun, 6 Oct 2024 14:30:16 +0300 Subject: [PATCH] spare part activity improvements --- .../request_detail_provider.dart | 2 +- .../views/components/activities_list_view.dart | 5 +++-- .../bottom_sheets/service_request_bottomsheet.dart | 3 +-- .../views/components/request_detail_view.dart | 5 ++++- .../forms/asset_retired/verify_asset_detail.dart | 2 +- .../views/forms/spare_part/spare_part_request.dart | 13 ++++++++----- 6 files changed, 18 insertions(+), 12 deletions(-) diff --git a/lib/service_request_latest/request_detail_provider.dart b/lib/service_request_latest/request_detail_provider.dart index 143c786..abdacbd 100644 --- a/lib/service_request_latest/request_detail_provider.dart +++ b/lib/service_request_latest/request_detail_provider.dart @@ -332,7 +332,7 @@ class RequestDetailProvider extends ChangeNotifier { isLoading = true; notifyListeners(); Map body = {'workOrderId': workOrderId, 'reOrderActivityDTOs': reOrderActivityDTOs}; - response = await ApiManager.instance.post(URLs.reOrderActivity, body: body); + response = await ApiManager.instance.put(URLs.reOrderActivity, body: body); stateCode = response.statusCode; if (response.statusCode >= 200 && response.statusCode < 300) { currentWorkOrder = WorkOrderDetail.fromJson(json.decode(response.body)); diff --git a/lib/service_request_latest/views/components/activities_list_view.dart b/lib/service_request_latest/views/components/activities_list_view.dart index 46f6a46..ce9e4d7 100644 --- a/lib/service_request_latest/views/components/activities_list_view.dart +++ b/lib/service_request_latest/views/components/activities_list_view.dart @@ -122,14 +122,15 @@ class _ActivitiesListViewState extends State { label: showReorderView ? "Confirm Order".addTranslation : context.translation.createNewActivity, maxWidth: true, buttonColor: AppColor.primary10, + loading: requestDetailProvider.isLoading, onPressed: () async { if (showReorderView) { - requestDetailProvider.currentWorkOrder!.data!.activities = reOrderActivities; - reOrderActivities = []; + // requestDetailProvider.currentWorkOrder!.data!.activities = reOrderActivities; List> data = []; for (int i = 0; i < reOrderActivities.length; i++) { data.add({"id": reOrderActivities[i].id, "orderNo": i}); } + reOrderActivities = []; requestDetailProvider.reOrderActivities(workOrderId: requestDetailProvider.currentWorkOrder!.data!.requestId!, reOrderActivityDTOs: data); showReorderView = false; return; diff --git a/lib/service_request_latest/views/components/bottom_sheets/service_request_bottomsheet.dart b/lib/service_request_latest/views/components/bottom_sheets/service_request_bottomsheet.dart index 964a259..63bf507 100644 --- a/lib/service_request_latest/views/components/bottom_sheets/service_request_bottomsheet.dart +++ b/lib/service_request_latest/views/components/bottom_sheets/service_request_bottomsheet.dart @@ -290,7 +290,7 @@ class ServiceRequestBottomSheet { visitDate: requestDetailProvider.needVisitHelperModel?.visitDate, comment: requestDetailProvider.needVisitHelperModel?.comment, )); - requestDetailProvider.engineerUpdateNeedVisit(); + requestDetailProvider.engineerUpdateNeedVisit(); } else { requestDetailProvider.needVisitHelperModel?.workOrderId = requestDetailProvider.currentWorkOrder!.data!.requestId; requestDetailProvider.engineerNeedVisit(); @@ -516,7 +516,6 @@ class ServiceRequestBottomSheet { ], ); })); - } static Future addAnotherSpareRequestBottomSheet({required BuildContext context}) { diff --git a/lib/service_request_latest/views/components/request_detail_view.dart b/lib/service_request_latest/views/components/request_detail_view.dart index 0dd66e3..abc350f 100644 --- a/lib/service_request_latest/views/components/request_detail_view.dart +++ b/lib/service_request_latest/views/components/request_detail_view.dart @@ -50,7 +50,10 @@ class WorkOrderDetailView extends StatelessWidget { ), ).expanded, FooterActionButton.requestDetailsFooterWidget( - workOrderNextStepStatus: requestProvider.currentWorkOrder!.data!.nextStep!.workOrderNextStepEnum!,activities:requestProvider.currentWorkOrder!.data?.activities??[], userProvider: _userProvider, context: context), + workOrderNextStepStatus: requestProvider.currentWorkOrder!.data!.nextStep!.workOrderNextStepEnum!, + activities: requestProvider.currentWorkOrder!.data?.activities ?? [], + userProvider: _userProvider, + context: context), ], ), // const TimerWidget(), diff --git a/lib/service_request_latest/views/forms/asset_retired/verify_asset_detail.dart b/lib/service_request_latest/views/forms/asset_retired/verify_asset_detail.dart index 7efcf22..7f0d274 100644 --- a/lib/service_request_latest/views/forms/asset_retired/verify_asset_detail.dart +++ b/lib/service_request_latest/views/forms/asset_retired/verify_asset_detail.dart @@ -87,7 +87,7 @@ class _VerifyAssetDetailsState extends State with TickerProv returnToService: currentWorkOrderData.returnToService, serviceType: currentWorkOrderData.serviceType, ); - _requestDetailProvider?.updateEngineerUpdateWorkOrderHelperModel(_requestDetailProvider?.engineerUpdateWorkOrderHelperModel); + // _requestDetailProvider?.updateEngineerUpdateWorkOrderHelperModel(_requestDetailProvider?.engineerUpdateWorkOrderHelperModel); getFaultDescription(); } diff --git a/lib/service_request_latest/views/forms/spare_part/spare_part_request.dart b/lib/service_request_latest/views/forms/spare_part/spare_part_request.dart index 4d10a51..e4bffba 100644 --- a/lib/service_request_latest/views/forms/spare_part/spare_part_request.dart +++ b/lib/service_request_latest/views/forms/spare_part/spare_part_request.dart @@ -49,19 +49,22 @@ class _SparePartRequestState extends State with TickerProvider final TextEditingController _oracleNoController = TextEditingController(); final TextEditingController _descriptionController = TextEditingController(); + Lookup statusLookup = Lookup.fromJson({"id": 5619, "name": "New", "value": 1}); + @override void initState() { super.initState(); _partsProvider = Provider.of(context, listen: false); _requestDetailProvider = Provider.of(context, listen: false); + _requestDetailProvider?.sparePartHelperModel = SparePartHelperModel( id: _requestDetailProvider?.sparePartHelperModel?.id ?? 0, workOrderId: _requestDetailProvider?.sparePartHelperModel?.workOrderId ?? _requestDetailProvider?.currentWorkOrder?.data?.requestId, sparePartAttachments: _requestDetailProvider?.sparePartHelperModel?.sparePartAttachments ?? [], sparePart: _requestDetailProvider?.sparePartHelperModel?.sparePart ?? SparePart(), quantity: _requestDetailProvider?.sparePartHelperModel?.quantity, - activityStatusId: _requestDetailProvider?.sparePartHelperModel?.activityStatusId, - activityStatus: _requestDetailProvider?.sparePartHelperModel?.activityStatus, + activityStatusId: _requestDetailProvider?.sparePartHelperModel?.activityStatusId ?? statusLookup.id, + activityStatus: _requestDetailProvider?.sparePartHelperModel?.activityStatus ?? statusLookup, comment: _requestDetailProvider?.sparePartHelperModel?.comment ?? '', ); _partQtyController.text = _requestDetailProvider?.sparePartHelperModel?.quantity != null ? _requestDetailProvider!.sparePartHelperModel!.quantity.toString() : ''; @@ -137,7 +140,8 @@ class _SparePartRequestState extends State with TickerProvider context: context, title: context.translation.partNo, staticData: _spareParts, - showShadow: false,loading: _isLoading, + showShadow: false, + loading: _isLoading, initialValue: requestDetailProvider.sparePartHelperModel?.sparePart, backgroundColor: context.isDark ? AppColor.neutral20 : AppColor.neutral90, onSelect: (part) { @@ -234,11 +238,10 @@ class _SparePartRequestState extends State with TickerProvider Navigator.pop(context); Navigator.pop(context); //show this only for add form.. - if(_requestDetailProvider?.sparePartHelperModel?.id==0){ + if (_requestDetailProvider?.sparePartHelperModel?.id == 0) { ServiceRequestBottomSheet.addAnotherSpareRequestBottomSheet(context: context); SizedBox().flushBar(context: context, title: context.translation.sparePartActivitySuccess, message: ''); } - } else { Navigator.pop(context); }