diff --git a/lib/controllers/providers/api/status_drop_down/report/service_report_reasons_provider.dart b/lib/controllers/providers/api/status_drop_down/report/service_report_reasons_provider.dart index 8884ca3e..81342360 100644 --- a/lib/controllers/providers/api/status_drop_down/report/service_report_reasons_provider.dart +++ b/lib/controllers/providers/api/status_drop_down/report/service_report_reasons_provider.dart @@ -52,7 +52,7 @@ class ServiceReportReasonsProvider extends ChangeNotifier { Response response; try { response = await ApiManager.instance.get( - URLs.getServiceReportReasons, + URLs.getServiceReportReasons+"&serviceRequestId=72355", ); _stateCode = response.statusCode; if (response.statusCode >= 200 && response.statusCode < 300) { diff --git a/lib/providers/work_order/reason_provider.dart b/lib/providers/work_order/reason_provider.dart index 39830c2d..bd53bf99 100644 --- a/lib/providers/work_order/reason_provider.dart +++ b/lib/providers/work_order/reason_provider.dart @@ -8,6 +8,8 @@ import '../../controllers/api_routes/urls.dart'; import '../../models/lookup.dart'; class ReasonProvider extends LoadingListNotifier { + + String serviceRequestId; @override Future getDate() async { if (loading == true) return -2; @@ -16,7 +18,7 @@ class ReasonProvider extends LoadingListNotifier { loading = true; notifyListeners(); try { - Response response = await ApiManager.instance.get(URLs.getServiceReportReasons); + Response response = await ApiManager.instance.get(URLs.getServiceReportReasons+"&serviceRequestId=$serviceRequestId"); stateCode = response.statusCode; if (response.statusCode >= 200 && response.statusCode < 300) { // client's request was successfully received diff --git a/lib/views/pages/sub_workorder/create_sub_workorder_page.dart b/lib/views/pages/sub_workorder/create_sub_workorder_page.dart index b74d8cef..046d04ef 100644 --- a/lib/views/pages/sub_workorder/create_sub_workorder_page.dart +++ b/lib/views/pages/sub_workorder/create_sub_workorder_page.dart @@ -86,6 +86,8 @@ class _CreateSubWorkOrderPageState extends State { super.initState(); if (context.mounted) { Provider.of(context, listen: false).reset(); + Provider.of(context, listen: false).reset(); + Provider.of(context, listen: false).serviceRequestId = widget.workOrder.callRequest.id.toString(); } } diff --git a/lib/views/pages/user/requests/work_order/create_service_report.dart b/lib/views/pages/user/requests/work_order/create_service_report.dart index b045afb8..090edb16 100644 --- a/lib/views/pages/user/requests/work_order/create_service_report.dart +++ b/lib/views/pages/user/requests/work_order/create_service_report.dart @@ -79,6 +79,8 @@ class _CreateServiceReportState extends State with TickerPr super.initState(); if (context.mounted) { Provider.of(context, listen: false).reset(); + Provider.of(context, listen: false).reset(); + Provider.of(context, listen: false).serviceRequestId = widget.request.id; } // _isLoading = true; } diff --git a/lib/views/pages/user/requests/work_order/edit_service_report.dart b/lib/views/pages/user/requests/work_order/edit_service_report.dart index d6731e9e..7bef0359 100644 --- a/lib/views/pages/user/requests/work_order/edit_service_report.dart +++ b/lib/views/pages/user/requests/work_order/edit_service_report.dart @@ -69,6 +69,10 @@ class _EditServiceReportState extends State with TickerProvid _files = widget.report?.attachmentsWorkOrder?.map((e) => File(e.name))?.toList(); _spareParts = _serviceReport.sparePartsWorkOrders.map((e) => e.sparePart).toList(); super.initState(); + if (context.mounted) { + Provider.of(context, listen: false).reset(); + Provider.of(context, listen: false).serviceRequestId = _serviceReport.callRequest.id.toString(); + } } void getRequestForWorkOrder() async { @@ -133,7 +137,6 @@ class _EditServiceReportState extends State with TickerProvid date: DateTime.tryParse(_serviceReport.visitDate ?? ""), formatDateWithTime: true, onDatePicker: (selectedDate) { - if (selectedDate != null) { showTimePicker( context: context, @@ -203,7 +206,9 @@ class _EditServiceReportState extends State with TickerProvid title: context.translation.reason, initialValue: _serviceReport.reason, onSelect: (value) { - _serviceReport.reason = value; + if (value != null) { + _serviceReport.reason = value; + } }, ), 8.height, @@ -336,7 +341,6 @@ class _EditServiceReportState extends State with TickerProvid AppFilledButton( label: context.translation.updateRequest, onPressed: () async { - if ((!_formKey.currentState.validate()) || (!(await _serviceReport.validate(context)))) { setState(() {}); return; diff --git a/lib/views/pages/user/requests/work_order/work_order_details_page.dart b/lib/views/pages/user/requests/work_order/work_order_details_page.dart index d0f01006..7c99f4bc 100644 --- a/lib/views/pages/user/requests/work_order/work_order_details_page.dart +++ b/lib/views/pages/user/requests/work_order/work_order_details_page.dart @@ -61,10 +61,6 @@ class WorkOrderDetailsPage extends StatelessWidget { '${context.translation.assetName}: ${workOrderDetails.callRequest.asset.modelDefinition.assetName?.cleanupWhitespace?.capitalizeFirstOfEach}', style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20), ), - Text( - '${context.translation.currentSituation}: ${workOrderDetails.currentSituation?.name}', - style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20), - ), Text( '${context.translation.orderWorkNumber}: ${workOrderDetails.workOrderNo}', style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20), @@ -83,11 +79,12 @@ class WorkOrderDetailsPage extends StatelessWidget { style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20)), Text('${context.translation.site}: ${workOrderDetails.callRequest.asset.site.custName ?? ""}', style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20)), - Text('${context.translation.callLastSituation}: ${workOrderDetails.calllastSituation.name ?? '' ?? ""}', + Text('${context.translation.currentSituation}: ${workOrderDetails.currentSituation?.name}', + style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20)), + Text('Situation: ${workOrderDetails.calllastSituation.name ?? '' ?? ""}', style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20)), Text('${context.translation.startDate}: ${workOrderDetails.startofWorkTime?.toServiceRequestDetailsFormat ?? "" ?? '' ?? ""}', style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20)), - Text('${context.translation.endDate}: ${workOrderDetails.endofWorkTime?.toServiceRequestDetailsFormat ?? "" ?? '' ?? ""}', style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20)), if (workOrderDetails.attachmentsWorkOrder.isNotEmpty) ...[