diff --git a/lib/modules/asset_delivery_module/helper_function.dart b/lib/modules/asset_delivery_module/helper_function.dart index f2958ebe..2f6f9399 100644 --- a/lib/modules/asset_delivery_module/helper_function.dart +++ b/lib/modules/asset_delivery_module/helper_function.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; +import 'package:provider/provider.dart'; import 'package:test_sa/controllers/providers/api/device_transfer_provider.dart'; import 'package:test_sa/extensions/context_extension.dart'; import 'package:test_sa/extensions/string_extensions.dart'; @@ -9,6 +10,7 @@ import 'package:test_sa/modules/asset_delivery_module/provider/asset_delivery_pr import 'package:test_sa/modules/asset_delivery_module/provider/attachment_type_provider.dart'; import 'package:test_sa/new_views/common_widgets/app_lazy_loading.dart'; import 'package:test_sa/new_views/common_widgets/single_item_drop_down_menu.dart'; +import 'package:test_sa/new_views/swipe_module/dialoge/acknowledge_work_dialog.dart'; import 'package:test_sa/views/widgets/loaders/no_data_found.dart'; class HelperFunction { @@ -39,6 +41,29 @@ class HelperFunction { } } + static void cancelRequest({required BuildContext context, int ?itemId, int? requestId}) async { + AssetDeliveryProvider assetDeliveryProvider = Provider.of(context, listen: false); + showDialog( + context: context, + builder: (BuildContext cxt) => AcknowledgeWorkDialog( + message: "Are you sure you want to change this request status to cancel ", + confirmButtonText: 'Ok', + cancelButtonText: 'Cancel', + onSave: () async { + showDialog(context: context, barrierDismissible: false, builder: (context) => const AppLazyLoading()); + await assetDeliveryProvider.changeDeliveryStatusToCancel(itemId: itemId).then((status) async { + Navigator.pop(context); + if (status) { + Navigator.pop(context); + await assetDeliveryProvider.getAssetDeliveryTableListById(requestId: requestId); + } + }); + }, + onDiscard: () {}, + ), + ); + } + static Future showAttachmentTypeBottomSheet(BuildContext context) { return showModalBottomSheet( context: context, diff --git a/lib/modules/asset_delivery_module/pages/asset_delivery_page.dart b/lib/modules/asset_delivery_module/pages/asset_delivery_page.dart index 28391201..ff681ee5 100644 --- a/lib/modules/asset_delivery_module/pages/asset_delivery_page.dart +++ b/lib/modules/asset_delivery_module/pages/asset_delivery_page.dart @@ -1,3 +1,5 @@ +import 'dart:developer'; + import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; import 'package:test_sa/extensions/context_extension.dart'; @@ -5,6 +7,7 @@ import 'package:test_sa/extensions/int_extensions.dart'; import 'package:test_sa/extensions/string_extensions.dart'; import 'package:test_sa/extensions/text_extensions.dart'; import 'package:test_sa/extensions/widget_extensions.dart'; +import 'package:test_sa/modules/asset_delivery_module/helper_function.dart'; import 'package:test_sa/modules/asset_delivery_module/models/asset_delivery_data_model.dart'; import 'package:test_sa/modules/asset_delivery_module/pages/asset_delivery_stage_tab_page.dart'; import 'package:test_sa/modules/asset_delivery_module/pages/asset_delivery_table_card_view.dart'; @@ -210,16 +213,8 @@ class _AssetDeliveryPageState extends State { style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral30 : AppColor.black10), ), 8.height, - //Need to verify this with backend ... - // widget.poInternal?? '-', Text( - dataModel?.isHMG == true - ? dataModel?.poNumber != null - ? dataModel!.poNumber.toString() - : '-' - : dataModel?.poNumber != null - ? dataModel!.poNumber.toString() - : '-', + getPOExternal(), style: AppTextStyles.bodyText2.copyWith(color: context.isDark ? AppColor.neutral30 : AppColor.neutral120), ), 8.height, @@ -288,6 +283,20 @@ class _AssetDeliveryPageState extends State { ); } + String getPOExternal() { + String poNo = '-'; + if (dataModel?.isHMG == true) { + if (dataModel?.poNumber != null) { + poNo = dataModel!.poNumber.toString(); + } + return poNo; + } + if (dataModel?.purchaseOrderMaster != null) { + poNo = dataModel!.purchaseOrderMaster!.poNumber.toString(); + } + return poNo; + } + Widget assetDeliveryTableList({required BuildContext context, required AssetDeliveryProvider assetDeliveryProvider}) { List assetDeliveryTableList = assetDeliveryProvider.assetDeliveryTableList; return assetDeliveryProvider.isDeliveryTableListLoading @@ -310,14 +319,15 @@ class _AssetDeliveryPageState extends State { AssetDeliveryBottomSheet.changeStatusBottomSheet( context: context, cancelStatusTap: () async { - showDialog(context: context, barrierDismissible: false, builder: (context) => const AppLazyLoading()); - await assetDeliveryProvider.changeDeliveryStatusToCancel(itemId: model.id).then((status) async { - Navigator.pop(context); - if (status) { - Navigator.pop(context); - await assetDeliveryProvider.getAssetDeliveryTableListById(requestId: widget.requestId); - } - }); + HelperFunction.cancelRequest(context: context, itemId: model.id, requestId: widget.requestId); + // showDialog(context: context, barrierDismissible: false, builder: (context) => const AppLazyLoading()); + // await assetDeliveryProvider.changeDeliveryStatusToCancel(itemId: model.id).then((status) async { + // Navigator.pop(context); + // if (status) { + // Navigator.pop(context); + // await assetDeliveryProvider.getAssetDeliveryTableListById(requestId: widget.requestId); + // } + // }); }, statusChangeTap: () async { showDialog(context: context, barrierDismissible: false, builder: (context) => const AppLazyLoading()); diff --git a/lib/modules/asset_delivery_module/pages/delivery_inspection/delivery_inspection_form_view.dart b/lib/modules/asset_delivery_module/pages/delivery_inspection/delivery_inspection_form_view.dart index c3acbdf4..a19a59be 100644 --- a/lib/modules/asset_delivery_module/pages/delivery_inspection/delivery_inspection_form_view.dart +++ b/lib/modules/asset_delivery_module/pages/delivery_inspection/delivery_inspection_form_view.dart @@ -9,6 +9,7 @@ import 'package:test_sa/extensions/int_extensions.dart'; import 'package:test_sa/extensions/string_extensions.dart'; import 'package:test_sa/extensions/text_extensions.dart'; import 'package:test_sa/extensions/widget_extensions.dart'; +import 'package:test_sa/helper/utils.dart'; import 'package:test_sa/models/lookup.dart'; import 'package:test_sa/modules/asset_delivery_module/helper_function.dart'; import 'package:test_sa/modules/asset_delivery_module/models/asset_delivery_data_model.dart'; @@ -28,6 +29,7 @@ import 'package:test_sa/new_views/app_style/app_color.dart'; import 'package:test_sa/new_views/common_widgets/app_lazy_loading.dart'; import 'package:test_sa/new_views/common_widgets/default_app_bar.dart'; import 'package:test_sa/new_views/common_widgets/single_item_drop_down_menu.dart'; +import 'package:test_sa/new_views/swipe_module/dialoge/acknowledge_work_dialog.dart'; import 'package:test_sa/views/widgets/date_and_time/date_picker.dart'; import 'package:test_sa/views/widgets/loaders/no_data_found.dart'; import '../../../../new_views/common_widgets/app_filled_button.dart'; @@ -559,14 +561,26 @@ class _DeliveryInspectionFormViewState extends State } void _cancelTap() async { - showDialog(context: context, barrierDismissible: false, builder: (context) => const AppLazyLoading()); - await assetDeliveryProvider!.changeDeliveryStatusToCancel(itemId: widget.deliveryTableModel.id).then((status) async { - Navigator.pop(context); - if (status) { - Navigator.pop(context); - await assetDeliveryProvider!.getAssetDeliveryTableListById(requestId: widget.requestModel?.id); - } - }); + HelperFunction.cancelRequest(context: context, itemId: widget.deliveryTableModel.id!, requestId: widget.requestModel?.id); + // showDialog( + // context: context, + // builder: (BuildContext cxt) => AcknowledgeWorkDialog( + // message: "Are you sure you want to mark this request as cancel ", + // confirmButtonText: 'Ok', + // cancelButtonText: 'Cancel', + // onSave: () async { + // showDialog(context: context, barrierDismissible: false, builder: (context) => const AppLazyLoading()); + // await assetDeliveryProvider!.changeDeliveryStatusToCancel(itemId: widget.deliveryTableModel.id).then((status) async { + // Navigator.pop(context); + // if (status) { + // Navigator.pop(context); + // await assetDeliveryProvider!.getAssetDeliveryTableListById(requestId: widget.requestModel?.id); + // } + // }); + // }, + // onDiscard: () {}, + // ), + // ); } void _saveTap() async { diff --git a/lib/modules/asset_delivery_module/pages/end_user_acceptance/end_user_cost_center_list_view.dart b/lib/modules/asset_delivery_module/pages/end_user_acceptance/end_user_cost_center_list_view.dart index 7b9336bc..0084d570 100644 --- a/lib/modules/asset_delivery_module/pages/end_user_acceptance/end_user_cost_center_list_view.dart +++ b/lib/modules/asset_delivery_module/pages/end_user_acceptance/end_user_cost_center_list_view.dart @@ -171,14 +171,15 @@ class _EndUserCostCenterLIstViewState extends State { } void _cancelTap() async { - showDialog(context: context, barrierDismissible: false, builder: (context) => const AppLazyLoading()); - await assetDeliveryProvider?.changeDeliveryStatusToCancel(itemId: widget.deliveryTableModel.id).then((status) async { - Navigator.pop(context); - if (status) { - Navigator.pop(context); - await assetDeliveryProvider?.getAssetDeliveryTableListById(requestId: widget.requestModel?.id); - } - }); + HelperFunction.cancelRequest(context: context, itemId: widget.deliveryTableModel.id!, requestId: widget.requestModel?.id); + // showDialog(context: context, barrierDismissible: false, builder: (context) => const AppLazyLoading()); + // await assetDeliveryProvider?.changeDeliveryStatusToCancel(itemId: widget.deliveryTableModel.id).then((status) async { + // Navigator.pop(context); + // if (status) { + // Navigator.pop(context); + // await assetDeliveryProvider?.getAssetDeliveryTableListById(requestId: widget.requestModel?.id); + // } + // }); } void _changeStatusTap() async { diff --git a/lib/modules/asset_delivery_module/pages/technical_inpection/technical_inspection_lines_list_view.dart b/lib/modules/asset_delivery_module/pages/technical_inpection/technical_inspection_lines_list_view.dart index 80b2308a..0f925ce0 100644 --- a/lib/modules/asset_delivery_module/pages/technical_inpection/technical_inspection_lines_list_view.dart +++ b/lib/modules/asset_delivery_module/pages/technical_inpection/technical_inspection_lines_list_view.dart @@ -250,14 +250,15 @@ class _TechnicalInspectionLinesListViewState extends State const AppLazyLoading()); - await assetDeliveryProvider?.changeDeliveryStatusToCancel(itemId: widget.deliveryTableModel.id).then((status) async { - Navigator.pop(context); - if (status) { - Navigator.pop(context); - await assetDeliveryProvider?.getAssetDeliveryTableListById(requestId: widget.requestModel?.id); - } - }); + HelperFunction.cancelRequest(context: context, itemId: widget.deliveryTableModel.id!, requestId: widget.requestModel?.id); + // showDialog(context: context, barrierDismissible: false, builder: (context) => const AppLazyLoading()); + // await assetDeliveryProvider?.changeDeliveryStatusToCancel(itemId: widget.deliveryTableModel.id).then((status) async { + // Navigator.pop(context); + // if (status) { + // Navigator.pop(context); + // await assetDeliveryProvider?.getAssetDeliveryTableListById(requestId: widget.requestModel?.id); + // } + // }); } void _nextTap() async {