From e66ae78c83df3df7b3340be0077b931c0dfafd15 Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Thu, 17 Apr 2025 15:08:23 +0300 Subject: [PATCH] files format --- lib/controllers/api_routes/urls.dart | 138 ++++++++++++------ .../providers/api/all_requests_provider.dart | 12 +- lib/models/ppm/recurrent_wo.dart | 3 +- .../user/gas_refill/gas_refill_form.dart | 36 ++--- .../user/gas_refill/request_gas_refill.dart | 16 +- .../components/room_inspection_card.dart | 1 - .../components/room_tabs_widget.dart | 3 +- .../components/task_info_widget.dart | 7 +- .../recurrent_work_order_view.dart | 8 +- 9 files changed, 124 insertions(+), 100 deletions(-) diff --git a/lib/controllers/api_routes/urls.dart b/lib/controllers/api_routes/urls.dart index edc1bcfe..f2055282 100644 --- a/lib/controllers/api_routes/urls.dart +++ b/lib/controllers/api_routes/urls.dart @@ -2,6 +2,7 @@ class URLs { URLs._(); static const String appReleaseBuildNumber = "14"; + // static const host1 = "https://atomsm.hmg.com"; // production url // static const host1 = "https://atomsmdev.hmg.com"; // local DEV url static const host1 = "https://atomsmuat.hmg.com"; // local UAT url @@ -42,54 +43,94 @@ class URLs { static get getModels => "$_baseUrl/ModelDefinition/GetModelDefinitionAsset"; // get ?client=2 static get getAllRequestsAndCount => "$_baseUrl/CallRequest/GetAllRequestsAndCount"; // get //service request new flow urls. - static get nurseDashboardCountUrl=> '$_baseUrl/ServiceRequest/GetDashboardNurseCount'; - static get nurseDashboardDetailsUrl=> '$_baseUrl/ServiceRequest/GetDashboardNurseDetails'; - static get nurseRejectUrl=> '$_baseUrl/ServiceRequest/NurseReject'; - static get engineerStopTimer=> '$_baseUrl/ServiceRequest/EngineerStopTimer'; - static get nurseConfirmEngineerArrivedUrl=> '$_baseUrl/ServiceRequest/NurseConfirm'; - static get nurseConfirmUrl=> '$_baseUrl/ServiceRequest/NurseConfirm'; - static get nurseRejectEngineerArrivedUrl=> '$_baseUrl/ServiceRequest/NurseNotArrive'; - static get nurseConfirmEngineerArrivalUrl=> '$_baseUrl/ServiceRequest/NurseAccept'; - static get engineerDashboardCountUrl=> '$_baseUrl/ServiceRequest/GetDashboardEngineerCount'; - static get engineerDashboardDetailsUrl=> '$_baseUrl/ServiceRequest/GetDashboardEngineerDetails'; - static get engineerDashboardNotAssignDetails=> '$_baseUrl/ServiceRequest/GetDashboardEngineerNotAssignDetails'; - static get engineerDashboardUpcoming=> '$_baseUrl/ServiceRequest/GetDashboardEngineerUpcoming'; - static get engineerAcceptUrl=> '$_baseUrl/ServiceRequest/EngineerAccept'; - static get engineerAssignHimSelfUrl=> '$_baseUrl/ServiceRequest/AssignEngineerToHimself'; - static get engineerRejectUrl=> '$_baseUrl/ServiceRequest/EngineerReject'; - static get engineerFixRemotlyUrl=> '$_baseUrl/ServiceRequest/EngineerFixRemotly'; - static get engineerNeedVisitUrl=> '$_baseUrl/ServiceRequest/EngineerNeedVisit'; - static get engineerUpdateNeedVisitUrl=> '$_baseUrl/ServiceRequest/EngineerUpdateNeedVisit'; - static get engineerMarkAsFixUrl=> '$_baseUrl/ServiceRequest/EngineerMarkAsFix'; - static get reOrderActivity=> '$_baseUrl/ServiceRequest/ReOrderActivity'; - static get engineerConfirmArriveUrl=> '$_baseUrl/ServiceRequest/EngineerConfirmArrive'; - static get engineerUpdateWorkOrderUrl=> '$_baseUrl/ServiceRequest/EngineerUpdateWorkOrder'; - static get engineerSetReminderUrl=> '$_baseUrl/ServiceRequest/EngineerSetReminder'; - static get getWorkOrderByIdUrl=> '$_baseUrl/ServiceRequest/GetWorkOrderById'; - static get getQrCodeUrl=> '$_baseUrl/ServiceRequest/GetQRCode'; - static get deleteActivitySparePartUrl=> '$_baseUrl/ServiceRequest/DeleteActivitySparePart'; - static get deleteActivityMaintenanceUrl=> '$_baseUrl/ServiceRequest/DeleteActivityMaintenance'; - static get createActivitySparePartUrl=> '$_baseUrl/ServiceRequest/CreateActivitySparePart'; - static get createActivityMaintenanceUrl=> '$_baseUrl/ServiceRequest/CreateActivityMaintenance'; - static get createActivityAssetToBeRetiredUrl=> '$_baseUrl/ServiceRequest/CreateActivityAssetToBeRetired'; - static get createWorkOrderUrl=> '$_baseUrl/ServiceRequest/CreateWorkOrder'; - static get updateActivitySparePartUrl=> '$_baseUrl/ServiceRequest/UpdateActivitySparePart'; - static get updateActivityMaintenanceUrl=> '$_baseUrl/ServiceRequest/UpdateActivityMaintenance'; - static get assignEngineerToWorkOrderUrl=> '$_baseUrl/ServiceRequest/AssignEngineerToWorkOrder'; - static get uploadWorkOrderAttachmentsUrl=> '$_baseUrl/ServiceRequest/UploadAttachmentsWorkOrder'; - - static get getArrivalVerificationTypeUrl=> '$_baseUrl/ArrivalVerificationType/GetArrivalVerificationType'; - static get sendOtpUrl=> '$_baseUrl/SmsNotification/SendOTP/'; - static get verifyOtpUrl=> '$_baseUrl/SmsNotification/VerifyOTP/'; + static get nurseDashboardCountUrl => '$_baseUrl/ServiceRequest/GetDashboardNurseCount'; + + static get nurseDashboardDetailsUrl => '$_baseUrl/ServiceRequest/GetDashboardNurseDetails'; + + static get nurseRejectUrl => '$_baseUrl/ServiceRequest/NurseReject'; + + static get engineerStopTimer => '$_baseUrl/ServiceRequest/EngineerStopTimer'; + + static get nurseConfirmEngineerArrivedUrl => '$_baseUrl/ServiceRequest/NurseConfirm'; + + static get nurseConfirmUrl => '$_baseUrl/ServiceRequest/NurseConfirm'; + + static get nurseRejectEngineerArrivedUrl => '$_baseUrl/ServiceRequest/NurseNotArrive'; + + static get nurseConfirmEngineerArrivalUrl => '$_baseUrl/ServiceRequest/NurseAccept'; + + static get engineerDashboardCountUrl => '$_baseUrl/ServiceRequest/GetDashboardEngineerCount'; + + static get engineerDashboardDetailsUrl => '$_baseUrl/ServiceRequest/GetDashboardEngineerDetails'; + + static get engineerDashboardNotAssignDetails => '$_baseUrl/ServiceRequest/GetDashboardEngineerNotAssignDetails'; + + static get engineerDashboardUpcoming => '$_baseUrl/ServiceRequest/GetDashboardEngineerUpcoming'; + + static get engineerAcceptUrl => '$_baseUrl/ServiceRequest/EngineerAccept'; + + static get engineerAssignHimSelfUrl => '$_baseUrl/ServiceRequest/AssignEngineerToHimself'; + + static get engineerRejectUrl => '$_baseUrl/ServiceRequest/EngineerReject'; + + static get engineerFixRemotlyUrl => '$_baseUrl/ServiceRequest/EngineerFixRemotly'; + + static get engineerNeedVisitUrl => '$_baseUrl/ServiceRequest/EngineerNeedVisit'; + + static get engineerUpdateNeedVisitUrl => '$_baseUrl/ServiceRequest/EngineerUpdateNeedVisit'; + + static get engineerMarkAsFixUrl => '$_baseUrl/ServiceRequest/EngineerMarkAsFix'; + + static get reOrderActivity => '$_baseUrl/ServiceRequest/ReOrderActivity'; + + static get engineerConfirmArriveUrl => '$_baseUrl/ServiceRequest/EngineerConfirmArrive'; + + static get engineerUpdateWorkOrderUrl => '$_baseUrl/ServiceRequest/EngineerUpdateWorkOrder'; + + static get engineerSetReminderUrl => '$_baseUrl/ServiceRequest/EngineerSetReminder'; + + static get getWorkOrderByIdUrl => '$_baseUrl/ServiceRequest/GetWorkOrderById'; + + static get getQrCodeUrl => '$_baseUrl/ServiceRequest/GetQRCode'; + + static get deleteActivitySparePartUrl => '$_baseUrl/ServiceRequest/DeleteActivitySparePart'; + + static get deleteActivityMaintenanceUrl => '$_baseUrl/ServiceRequest/DeleteActivityMaintenance'; + + static get createActivitySparePartUrl => '$_baseUrl/ServiceRequest/CreateActivitySparePart'; + + static get createActivityMaintenanceUrl => '$_baseUrl/ServiceRequest/CreateActivityMaintenance'; + + static get createActivityAssetToBeRetiredUrl => '$_baseUrl/ServiceRequest/CreateActivityAssetToBeRetired'; + + static get createWorkOrderUrl => '$_baseUrl/ServiceRequest/CreateWorkOrder'; + + static get updateActivitySparePartUrl => '$_baseUrl/ServiceRequest/UpdateActivitySparePart'; + + static get updateActivityMaintenanceUrl => '$_baseUrl/ServiceRequest/UpdateActivityMaintenance'; + + static get assignEngineerToWorkOrderUrl => '$_baseUrl/ServiceRequest/AssignEngineerToWorkOrder'; + + static get uploadWorkOrderAttachmentsUrl => '$_baseUrl/ServiceRequest/UploadAttachmentsWorkOrder'; + + static get getArrivalVerificationTypeUrl => '$_baseUrl/ArrivalVerificationType/GetArrivalVerificationType'; + + static get sendOtpUrl => '$_baseUrl/SmsNotification/SendOTP/'; + + static get verifyOtpUrl => '$_baseUrl/SmsNotification/VerifyOTP/'; + // 08051 //Swipe module Api.. - static get swipeUrl=> '$_baseUrl/Swipe/Swipe'; - static get getSwipeLastTransactionUrl=> '$_baseUrl/Swipe/GetLastTransaction'; - static get getSwipeTransactionHistoryUrl=> '$_baseUrl/Swipe/GetTransactions'; + static get swipeUrl => '$_baseUrl/Swipe/Swipe'; + + static get getSwipeLastTransactionUrl => '$_baseUrl/Swipe/GetLastTransaction'; + + static get getSwipeTransactionHistoryUrl => '$_baseUrl/Swipe/GetTransactions'; + //Recurrent plan Api... - static get getRecurrentPlanByIdUrl=> '$_baseUrl/PlanRecurrentTasks/GetPlanRecurrentTaskById'; - static get updateRecurrentPlanUrl=> '$_baseUrl/PlanRecurrentTasks/UpdateTaskByEngineer'; + static get getRecurrentPlanByIdUrl => '$_baseUrl/PlanRecurrentTasks/GetPlanRecurrentTaskById'; + static get updateRecurrentPlanUrl => '$_baseUrl/PlanRecurrentTasks/UpdateTaskByEngineer'; //service request..... static get getServiceRequests => "$_baseUrl/CallRequest/GetCallRequests"; // get @@ -147,11 +188,17 @@ class URLs { static get getPpmService => "$_baseUrl/Lookups/GetLookup?lookupEnum=34"; // get for ppm po reason, in mobile there is no use of it. static get getServiceReportReasons => "$_baseUrl/Lookups/GetLookupReason?lookupEnum=505"; + static get getServiceReportRejectionReasons => "$_baseUrl/Lookups/GetLookup?lookupEnum=1303"; + static get getServiceReportReasonsNew => "$_baseUrl/Lookups/GetLookupReasonNew?lookupEnum=505"; + static get getServiceReportRetirementType => "$_baseUrl/Lookups/GetLookup?lookupEnum=415"; + static get getVisitReminderTimeValue => "$_baseUrl/Lookups/GetLookup?lookupEnum=1211"; + static get getServiceReportActivityStatus => "$_baseUrl/Lookups/GetLookup?lookupEnum=1302"; + static get getServiceReportTypes => "$_baseUrl/Lookups/GetLookup?lookupEnum=501"; // get static get getServiceReportTypesForWO => "$_baseUrl/Lookups/GetLookup?lookupEnum=34"; // get static get getServiceReportStatus => "$_baseUrl/Lookups/GetLookup?lookupEnum=521"; // get @@ -164,6 +211,7 @@ class URLs { static get getServiceReportDefectTypes => "$_baseUrl/Lookups/GetLookup?lookupEnum=601"; // get static get getCallRequestForWorkOrder => "$_baseUrl/CallRequest/GetCallRequestForWorkOrder"; // get static get attachmentBaseUrl => "https://atomsmdev.hmg.com/v2/mobile/Files/DownloadFile?fileName="; + //gas refill static get getGasTypes => "$_baseUrl/Lookups/GetLookup?lookupEnum=606"; // get // todo check edits with backend @@ -188,7 +236,7 @@ class URLs { //Asset transfer new Apis static get getAssetTransferById => "$_baseUrl/AssetTransfer/GetAssetTransferNewById"; // get - static get createAssetTransferRequest => "$_baseUrl/AssetTransfer/AddAssetTransferMobileNew";// post + static get createAssetTransferRequest => "$_baseUrl/AssetTransfer/AddAssetTransferMobileNew"; // post static get updateDeviceTransfer => "$_baseUrl/AssetTransfer/UpdateEngineerAssetTransferNew"; // get // employee diff --git a/lib/controllers/providers/api/all_requests_provider.dart b/lib/controllers/providers/api/all_requests_provider.dart index afaf7b54..f22d8329 100644 --- a/lib/controllers/providers/api/all_requests_provider.dart +++ b/lib/controllers/providers/api/all_requests_provider.dart @@ -4,7 +4,6 @@ import 'package:flutter/widgets.dart'; import 'package:http/http.dart'; import 'package:test_sa/controllers/api_routes/api_manager.dart'; import 'package:test_sa/controllers/api_routes/urls.dart'; -import 'package:test_sa/extensions/context_extension.dart'; import 'package:test_sa/models/all_requests_and_count_model.dart'; import 'package:test_sa/models/enums/user_types.dart'; import 'package:test_sa/models/ppm/recurrent_wo.dart'; @@ -62,7 +61,7 @@ class AllRequestsProvider extends ChangeNotifier { // AllRequestsAndCount? get completedRequests => _completedRequests; AllRequestsAndCount? get requestDetailList => _requestDetailList; - RecurrentWoData? _recurrentWoData=RecurrentWoData(); + RecurrentWoData? _recurrentWoData = RecurrentWoData(); RecurrentWoData? get recurrentWoData => _recurrentWoData; @@ -201,11 +200,10 @@ class AllRequestsProvider extends ChangeNotifier { stateCode = response.statusCode; if (response.statusCode >= 200 && response.statusCode < 300) { recurrentWoData = RecurrentWoData.fromJson(json.decode(response.body)["data"]); - recurrentWoData?.planRecurrentMedicalTaskRooms?.forEach((element){ - element.planRecurrentMedicalTaskRoomTabs?.forEach((tabs){ - tabs.planRecurrentMedicalTaskRoomTabAttributes?.forEach((attribute){ - print(attribute.attribute?.name); - if(attribute.attribute?.type=="bool" && attribute.attributeValue ==null) { + recurrentWoData?.planRecurrentMedicalTaskRooms?.forEach((element) { + element.planRecurrentMedicalTaskRoomTabs?.forEach((tabs) { + tabs.planRecurrentMedicalTaskRoomTabAttributes?.forEach((attribute) { + if (attribute.attribute?.type == "bool" && attribute.attributeValue == null) { attribute.attributeValue = "true"; } }); diff --git a/lib/models/ppm/recurrent_wo.dart b/lib/models/ppm/recurrent_wo.dart index e5d27c10..8eda557d 100644 --- a/lib/models/ppm/recurrent_wo.dart +++ b/lib/models/ppm/recurrent_wo.dart @@ -55,7 +55,6 @@ class RecurrentWoData { List? timerModelList = []; String? comment; - RecurrentWoData( {this.id, this.title, @@ -72,7 +71,7 @@ class RecurrentWoData { this.planRecurrentMedicalTaskRooms, this.planRecurrentTaskTimers, this.timerModelList, - this.comment, + this.comment, this.totalWorkingHours}); RecurrentWoData.fromJson(Map json) { diff --git a/lib/views/pages/user/gas_refill/gas_refill_form.dart b/lib/views/pages/user/gas_refill/gas_refill_form.dart index b7c89455..3a800653 100644 --- a/lib/views/pages/user/gas_refill/gas_refill_form.dart +++ b/lib/views/pages/user/gas_refill/gas_refill_form.dart @@ -1,20 +1,16 @@ import 'dart:convert'; -import 'dart:developer'; import 'dart:io'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:fluttertoast/fluttertoast.dart'; import 'package:provider/provider.dart'; -import 'package:test_sa/controllers/api_routes/http_status_manger.dart'; import 'package:test_sa/controllers/providers/api/all_requests_provider.dart'; import 'package:test_sa/controllers/providers/api/gas_refill_provider.dart'; import 'package:test_sa/controllers/providers/api/user_provider.dart'; import 'package:test_sa/controllers/providers/settings/setting_provider.dart'; -import 'package:test_sa/controllers/validator/validator.dart'; import 'package:test_sa/extensions/context_extension.dart'; import 'package:test_sa/extensions/int_extensions.dart'; -import 'package:test_sa/extensions/string_extensions.dart'; import 'package:test_sa/extensions/widget_extensions.dart'; import 'package:test_sa/models/lookup.dart'; import 'package:test_sa/models/timer_model.dart'; @@ -27,14 +23,11 @@ import 'package:test_sa/service_request_latest/views/components/action_button/fo import 'package:test_sa/views/widgets/images/multi_image_picker.dart'; import 'package:test_sa/views/widgets/loaders/loading_manager.dart'; -import '../../../../controllers/providers/api/hospitals_provider.dart'; import '../../../../extensions/text_extensions.dart'; import '../../../../models/new_models/gas_refill_model.dart'; import '../../../../new_views/common_widgets/app_text_form_field.dart'; import '../../../../new_views/common_widgets/default_app_bar.dart'; import '../../../../new_views/common_widgets/single_item_drop_down_menu.dart'; -import '../../../../providers/gas_request_providers/gas_status_provider.dart'; -import '../../../widgets/e_signature/e_signature.dart'; import '../../../widgets/timer/app_timer.dart'; class GasRefillForm extends StatefulWidget { @@ -106,8 +99,7 @@ class _GasRefillFormState extends State { if (mounted) super.setState(() {}); } - _onSubmit(BuildContext context,int status) async { - + _onSubmit(BuildContext context, int status) async { if (_formModel.timer?.startAt == null) { await Fluttertoast.showToast(msg: "Working Hours Required"); return false; @@ -116,11 +108,11 @@ class _GasRefillFormState extends State { await Fluttertoast.showToast(msg: "Please Stop The Timer"); return false; } - if(_currentDetails.deliverdQty==null){ + if (_currentDetails.deliverdQty == null) { await Fluttertoast.showToast(msg: "Delivered Quantity is Required"); return false; } - _formModel.gasRefillDetails=[]; + _formModel.gasRefillDetails = []; _formModel.gasRefillDetails?.add(_currentDetails); showDialog(context: context, barrierDismissible: false, builder: (context) => const AppLazyLoading()); @@ -139,17 +131,12 @@ class _GasRefillFormState extends State { }); _formModel.gasRefillAttachments = []; for (var item in _gasRefillProvider!.gasRefillAttachments) { - _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(() { + await _gasRefillProvider?.updateGasRefill(status: status, model: _formModel).whenComplete(() { if (status == 1) { - AllRequestsProvider allRequestsProvider = Provider.of(context,listen: false); + AllRequestsProvider allRequestsProvider = Provider.of(context, listen: false); // when click complete then this request remove from the list and status changes to closed.. _gasRefillProvider?.reset(); allRequestsProvider.getAllRequests(context, typeTransaction: 2); @@ -157,10 +144,8 @@ class _GasRefillFormState extends State { Navigator.pop(context); Navigator.pop(context); }); - } - @override void dispose() { _deliveredQuantityController.dispose(); @@ -203,8 +188,7 @@ class _GasRefillFormState extends State { // setState(() {}); // }); } - double totalWorkingHours = - _formModel.gasRefillTimers?.fold(0.0, (sum, item) => (sum ?? 0) + DateTime.parse(item.endDate!).difference(DateTime.parse(item.startDate!)).inSeconds) ?? 0; + 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), @@ -287,7 +271,6 @@ class _GasRefillFormState extends State { // 8.height, - /// TBD AppTextFormField( labelText: context.translation.technicalComment, @@ -296,7 +279,7 @@ class _GasRefillFormState extends State { backgroundColor: AppColor.neutral100, showShadow: false, controller: _commentController, - onChange: (value){ + onChange: (value) { _formModel.techComment = value; }, onSaved: (value) {}, @@ -355,7 +338,6 @@ class _GasRefillFormState extends State { ], ), ), - ], )), ), diff --git a/lib/views/pages/user/gas_refill/request_gas_refill.dart b/lib/views/pages/user/gas_refill/request_gas_refill.dart index 9a4e23b4..d05ea482 100644 --- a/lib/views/pages/user/gas_refill/request_gas_refill.dart +++ b/lib/views/pages/user/gas_refill/request_gas_refill.dart @@ -8,7 +8,6 @@ import 'package:test_sa/controllers/api_routes/http_status_manger.dart'; import 'package:test_sa/controllers/providers/api/gas_refill_provider.dart'; import 'package:test_sa/controllers/providers/api/user_provider.dart'; import 'package:test_sa/controllers/providers/settings/setting_provider.dart'; -import 'package:test_sa/controllers/validator/validator.dart'; import 'package:test_sa/extensions/context_extension.dart'; import 'package:test_sa/extensions/int_extensions.dart'; import 'package:test_sa/extensions/string_extensions.dart'; @@ -59,7 +58,6 @@ class _RequestGasRefillState extends State { final GlobalKey _scaffoldKey = GlobalKey(); bool _firstTime = true; - Lookup? _deliveredQuantity; static List deliveredQuantity = [ @@ -135,7 +133,7 @@ class _RequestGasRefillState extends State { } } - bool _addNewModel(BuildContext context) { + bool _addNewModel(BuildContext context) { _validate = true; if (_currentDetails.deliverdQty == null) { Fluttertoast.showToast(msg: "${context.translation.youHaveToSelect} ${context.translation.quantity}"); @@ -151,7 +149,7 @@ class _RequestGasRefillState extends State { _currentDetails.cylinderSize = _formModel.gasRefillDetails![0].cylinderSize; _currentDetails.cylinderType = _formModel.gasRefillDetails![0].cylinderType; _currentDetails.requestedQty = _formModel.gasRefillDetails![0].requestedQty; - if (!( _currentDetails.validate(context))) { + if (!(_currentDetails.validate(context))) { setState(() {}); return false; } @@ -191,11 +189,11 @@ class _RequestGasRefillState extends State { clientName = _userProvider.user?.clientName; } - HospitalsProvider().getHospitalsListByVal(searchVal: clientName??'').then((value) { - _gasRefillProvider!.hospital = value.firstWhere((element) => element.name == clientName, orElse: null); - _gasRefillProvider!.building = _gasRefillProvider!.hospital?.buildings?.firstWhere((element) => element.name == widget.gasRefillModel?.building?.name, orElse: null); - _gasRefillProvider!.floor = _gasRefillProvider!.building?.floors?.firstWhere((element) => element.name == widget.gasRefillModel?.floor?.name, orElse: null); - _gasRefillProvider!.department = _gasRefillProvider!.floor?.departments?.firstWhere((element) => element.name == widget.gasRefillModel?.department?.departmentName, orElse: null); + HospitalsProvider().getHospitalsListByVal(searchVal: clientName ?? '').then((value) { + _gasRefillProvider!.hospital = value.firstWhere((element) => element.name == clientName, orElse: null); + _gasRefillProvider!.building = _gasRefillProvider!.hospital?.buildings?.firstWhere((element) => element.name == widget.gasRefillModel?.building?.name, orElse: null); + _gasRefillProvider!.floor = _gasRefillProvider!.building?.floors?.firstWhere((element) => element.name == widget.gasRefillModel?.floor?.name, orElse: null); + _gasRefillProvider!.department = _gasRefillProvider!.floor?.departments?.firstWhere((element) => element.name == widget.gasRefillModel?.department?.departmentName, orElse: null); _firstTime = false; setState(() {}); }); diff --git a/lib/views/pages/user/ppm/ppm_work_order/recurrent_wo/components/room_inspection_card.dart b/lib/views/pages/user/ppm/ppm_work_order/recurrent_wo/components/room_inspection_card.dart index 511ae268..295eff91 100644 --- a/lib/views/pages/user/ppm/ppm_work_order/recurrent_wo/components/room_inspection_card.dart +++ b/lib/views/pages/user/ppm/ppm_work_order/recurrent_wo/components/room_inspection_card.dart @@ -55,7 +55,6 @@ class _RoomInspectionCardState extends State { Widget inspectionStatusRadioWidget({required int index, required PlanRecurrentMedicalTaskRoomTabAttributes model, required BuildContext context}) { bool status = (model.attribute == null || model.attributeValue == null) ? true : (model.attribute != null ? (model.attributeValue == 'true' ? true : false) : false); - return Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, crossAxisAlignment: CrossAxisAlignment.center, diff --git a/lib/views/pages/user/ppm/ppm_work_order/recurrent_wo/components/room_tabs_widget.dart b/lib/views/pages/user/ppm/ppm_work_order/recurrent_wo/components/room_tabs_widget.dart index 9d7f01b0..cbf5c9c7 100644 --- a/lib/views/pages/user/ppm/ppm_work_order/recurrent_wo/components/room_tabs_widget.dart +++ b/lib/views/pages/user/ppm/ppm_work_order/recurrent_wo/components/room_tabs_widget.dart @@ -76,7 +76,8 @@ class _RoomTabsWidgetState extends State { ? const ALoading().paddingOnly(top: 150) : ListView( shrinkWrap: true, - physics: const NeverScrollableScrollPhysics(), padding: EdgeInsets.zero, + physics: const NeverScrollableScrollPhysics(), + padding: EdgeInsets.zero, children: widget.model!.planRecurrentMedicalTaskRooms![selectedIndex].planRecurrentMedicalTaskRoomTabs!.map((card) { return RoomInspectionCard(inspectionModel: card); }).toList(), diff --git a/lib/views/pages/user/ppm/ppm_work_order/recurrent_wo/components/task_info_widget.dart b/lib/views/pages/user/ppm/ppm_work_order/recurrent_wo/components/task_info_widget.dart index a7d81af4..7034f7ca 100644 --- a/lib/views/pages/user/ppm/ppm_work_order/recurrent_wo/components/task_info_widget.dart +++ b/lib/views/pages/user/ppm/ppm_work_order/recurrent_wo/components/task_info_widget.dart @@ -6,10 +6,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/models/all_requests_and_count_model.dart'; -import 'package:test_sa/models/ppm/ppm.dart'; import 'package:test_sa/models/ppm/recurrent_wo.dart'; -import 'package:test_sa/models/timer_model.dart'; import 'package:test_sa/new_views/app_style/app_color.dart'; import 'package:test_sa/new_views/common_widgets/app_text_form_field.dart'; import 'package:test_sa/service_request_latest/utilities/service_request_utils.dart'; @@ -79,7 +76,7 @@ class RecurrentTaskInfoWidget extends StatelessWidget { label: context.translation.timer, timer: snapshot.recurrentWoData?.recurrentWoTimerModel, width: double.infinity, - enabled: snapshot.recurrentWoData?.status?.value != 1, + enabled: snapshot.recurrentWoData?.status?.value != 1, decoration: BoxDecoration( color: AppColor.neutral100, borderRadius: BorderRadius.circular(10), @@ -129,7 +126,7 @@ class RecurrentTaskInfoWidget extends StatelessWidget { } } -Widget buildingInfoWidget({required String label, required String ?value, required BuildContext context}) { +Widget buildingInfoWidget({required String label, required String? value, required BuildContext context}) { return Column( mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start, diff --git a/lib/views/pages/user/ppm/ppm_work_order/recurrent_wo/recurrent_work_order_view.dart b/lib/views/pages/user/ppm/ppm_work_order/recurrent_wo/recurrent_work_order_view.dart index c2702430..c7ca4c5a 100644 --- a/lib/views/pages/user/ppm/ppm_work_order/recurrent_wo/recurrent_work_order_view.dart +++ b/lib/views/pages/user/ppm/ppm_work_order/recurrent_wo/recurrent_work_order_view.dart @@ -100,9 +100,11 @@ class _RecurrentWorkOrderViewState extends State { ], ) : NoDataFound(message: context.translation.noDataFound).center, - ).handlePopScope(cxt: context,onSave: () { - _updateTask(context: context, status: 0); - }); + ).handlePopScope( + cxt: context, + onSave: () { + _updateTask(context: context, status: 0); + }); }); } }