From 5fc2aceecf86462c85bd11c46e44f4dfea4841a3 Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Sun, 10 Sep 2023 14:07:20 +0300 Subject: [PATCH] ppm disable edit on closed, gaz refill site fix, & print statements remove. --- .../providers/api/gas_refill_provider.dart | 1 - .../api/service_requests_provider.dart | 6 ----- lib/models/device/device.dart | 1 - lib/models/pantry/pentry.dart | 1 - lib/models/service_report.dart | 1 - .../service_request/search_work_order.dart | 4 ---- .../service_request/service_request.dart | 2 -- .../request_device_transfer.dart | 2 -- .../user/gas_refill/gas_refill_details.dart | 2 -- .../user/gas_refill/request_gas_refill.dart | 8 +++++-- .../report/create_service_report.dart | 2 -- .../report/future_service_report.dart | 1 - .../pages/user/visits/visit_details.dart | 22 ++++++++++--------- .../device_transfer_info_section.dart | 1 - .../equipment/single_device_picker.dart | 1 - .../report/service_report_last_call.dart | 1 - 16 files changed, 18 insertions(+), 38 deletions(-) diff --git a/lib/controllers/providers/api/gas_refill_provider.dart b/lib/controllers/providers/api/gas_refill_provider.dart index f2e64a1e..9e24fcb6 100644 --- a/lib/controllers/providers/api/gas_refill_provider.dart +++ b/lib/controllers/providers/api/gas_refill_provider.dart @@ -60,7 +60,6 @@ class GasRefillProvider extends ChangeNotifier { body["pageNumber"] = (items?.length ?? 0) ~/ pageItemNumber + 1; body["pageSize"] = pageItemNumber; body["mostRecent"] = mostRecent; - print("url:${URLs.getGasRefill}:body:$body"); response = await ApiManager.instance.post(URLs.getGasRefill, body: body); stateCode = response.statusCode; diff --git a/lib/controllers/providers/api/service_requests_provider.dart b/lib/controllers/providers/api/service_requests_provider.dart index 169aa892..c27d9a50 100644 --- a/lib/controllers/providers/api/service_requests_provider.dart +++ b/lib/controllers/providers/api/service_requests_provider.dart @@ -223,7 +223,6 @@ class ServiceRequestsProvider extends ChangeNotifier { Map serviceRequest = await getServiceRequestById(requestId: request.id) ?? ""; final List callSiteContacts = (serviceRequest['callSiteContactPerson'] as List); final Map callSiteContactPerson = callSiteContacts.isEmpty ? {} : callSiteContacts[0]; - print(callSiteContactPerson); Response response; var body = { "id": request.id, @@ -356,7 +355,6 @@ class ServiceRequestsProvider extends ChangeNotifier { // body["uid"] = user.id; // body["token"] = user.token; response = await ApiManager.instance.post(URLs.createServiceReport, body: body); - print(response.body); // response = await post( // Uri.parse( // host+URLs.createServiceReport), @@ -382,8 +380,6 @@ class ServiceRequestsProvider extends ChangeNotifier { try { Map body = workOrder.toJson(); response = await ApiManager.instance.post(URLs.createServiceReport, body: body); - print(response.body); - stateCode = response.statusCode; if (response.statusCode >= 200 && response.statusCode < 300) { reset(); @@ -434,7 +430,6 @@ class ServiceRequestsProvider extends ChangeNotifier { if (response.statusCode >= 200 && response.statusCode < 300) { // client's request was successfully received List workOrdersJson = json.decode(response.body)["data"]; - print(workOrdersJson); workOrders = workOrdersJson.map((request) => SearchWorkOrder.fromJson(request)).toList(); if (workOrders.length == pageItemNumber) { nextPage = true; @@ -683,7 +678,6 @@ class ServiceRequestsProvider extends ChangeNotifier { if (response.statusCode >= 200 && response.statusCode < 300) { // client's request was successfully received List workOrdersJson = json.decode(response.body)["data"]; - print(workOrdersJson); workOrders ??= []; workOrders.addAll(workOrdersJson.map((request) => SearchWorkOrder.fromJson(request)).toList()); if (workOrders.length == pageItemNumber) { diff --git a/lib/models/device/device.dart b/lib/models/device/device.dart index c348d2f8..fe6a8409 100644 --- a/lib/models/device/device.dart +++ b/lib/models/device/device.dart @@ -42,7 +42,6 @@ class Device { }); factory Device.fromJson(Map parsedJson, {bool startKeyWithDest = true}) { - print("parsedJson:$parsedJson"); return Device( id: parsedJson["id"], serialNumber: parsedJson["assetSerialNo"], diff --git a/lib/models/pantry/pentry.dart b/lib/models/pantry/pentry.dart index 486a4e71..c59e651f 100644 --- a/lib/models/pantry/pentry.dart +++ b/lib/models/pantry/pentry.dart @@ -153,7 +153,6 @@ class Pentry { calibrationTools: calibrationTools, pmKits: pmKits, files: files?.map((e) { - print("${map["id"]}:${files?.length}:e:$e"); return File(e); })?.toList() ?? [], diff --git a/lib/models/service_report.dart b/lib/models/service_report.dart index 2f3da26c..7575bce3 100644 --- a/lib/models/service_report.dart +++ b/lib/models/service_report.dart @@ -138,7 +138,6 @@ class ServiceReport { //if(invoiceNumber != null) _map["invoice_code"] = invoiceNumber; if (files != null) { _map["attachmentsWorkOrder"] = files.map((e) => {"name": e}).toList(); - print(_map["attachmentsWorkOrder"]); } _map["nurseSignature"] = signatureNurse; _map["engSignature"] = signatureEngineer; diff --git a/lib/models/service_request/search_work_order.dart b/lib/models/service_request/search_work_order.dart index 4294f499..3af66fe8 100644 --- a/lib/models/service_request/search_work_order.dart +++ b/lib/models/service_request/search_work_order.dart @@ -1840,10 +1840,6 @@ class Asset { } map['assetType'] = assetType?.toMap(); - print("supplier : ${supplier?.toJson()}"); - print("supplier 2 : ${map['supplier']}"); - print("asset type : ${assetType?.toMap()}"); - print("asset type 2: ${map['assetType']}"); if (site != null) { map['site'] = site.toJson(); } diff --git a/lib/models/service_request/service_request.dart b/lib/models/service_request/service_request.dart index 98457831..836112c3 100644 --- a/lib/models/service_request/service_request.dart +++ b/lib/models/service_request/service_request.dart @@ -86,11 +86,9 @@ class ServiceRequest { factory ServiceRequest.fromJson(Map parsedJson) { List images = []; - print(parsedJson["attachmentsCallRequest"]); if (parsedJson["attachmentsCallRequest"] != null) if (parsedJson["attachmentsCallRequest"] is List) { List list = parsedJson["attachmentsCallRequest"]; images = list.map((e) => URLs.getFileUrl(e["name"])).toList(); - print(images); } return ServiceRequest( id: parsedJson["id"].toString(), diff --git a/lib/views/pages/device_transfer/request_device_transfer.dart b/lib/views/pages/device_transfer/request_device_transfer.dart index 7e3617d1..5f6ad2a3 100644 --- a/lib/views/pages/device_transfer/request_device_transfer.dart +++ b/lib/views/pages/device_transfer/request_device_transfer.dart @@ -150,8 +150,6 @@ class _RequestDeviceTransferState extends State { onDevicePick: (device) { _formModel.device = device; _formModel.sender.client = device.hospital; - print("device : ${device.hospital.id}"); - print("_formModel : ${_formModel.sender.client.id}"); setState(() {}); }, ), diff --git a/lib/views/pages/user/gas_refill/gas_refill_details.dart b/lib/views/pages/user/gas_refill/gas_refill_details.dart index 9a98b8d0..39422b24 100644 --- a/lib/views/pages/user/gas_refill/gas_refill_details.dart +++ b/lib/views/pages/user/gas_refill/gas_refill_details.dart @@ -125,9 +125,7 @@ class _GasRefillDetailsState extends State { ? null : () async { // _enableEdit = !_enableEdit; - print(widget.model.startDate); _model?.fromGasRefillModel(widget.model); - print(widget.model.startDate); // setState(() {}); Navigator.push( context, 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 d1e6e95d..48dc0edb 100644 --- a/lib/views/pages/user/gas_refill/request_gas_refill.dart +++ b/lib/views/pages/user/gas_refill/request_gas_refill.dart @@ -154,15 +154,19 @@ class _RequestGasRefillState extends State { //_gasRefillProvider.reset(); } if (_firstTime) { + String _clientName; if (widget.gasRefillModel != null) { _formModel.status = widget.gasRefillModel?.status ?? const Lookup(value: 0); _gasRefillProvider.expectedDateTime = _formModel.expectedDate; _gasRefillProvider.timer = TimerModel(startAt: widget.gasRefillModel?.startDate, endAt: widget.gasRefillModel?.endDate); + _clientName = _formModel.clientName; } else { _gasRefillProvider.timer = null; + _clientName = _userProvider.user?.clientName; } - HospitalsProvider().getHospitalsListByVal(searchVal: _formModel.clientName).then((value) { - _gasRefillProvider.hospital = value?.firstWhere((element) => element.name == _formModel.clientName, 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); diff --git a/lib/views/pages/user/requests/report/create_service_report.dart b/lib/views/pages/user/requests/report/create_service_report.dart index 25a6bb24..0e7d35d8 100644 --- a/lib/views/pages/user/requests/report/create_service_report.dart +++ b/lib/views/pages/user/requests/report/create_service_report.dart @@ -938,8 +938,6 @@ class _CreateServiceReportState extends State with TickerPr report: _serviceReport, request: widget.request, ); - print(6); - print(status); _isLoading = false; setState(() {}); if (status >= 200 && status < 300) { diff --git a/lib/views/pages/user/requests/report/future_service_report.dart b/lib/views/pages/user/requests/report/future_service_report.dart index 258a857b..a54e3566 100644 --- a/lib/views/pages/user/requests/report/future_service_report.dart +++ b/lib/views/pages/user/requests/report/future_service_report.dart @@ -46,7 +46,6 @@ class _FutureServiceReportState extends State { ); } if (snapshot.connectionState == ConnectionState.done) { - print("object"); return EditServiceReport( report: snapshot.data, request: widget.request, diff --git a/lib/views/pages/user/visits/visit_details.dart b/lib/views/pages/user/visits/visit_details.dart index 9d60fcc6..e75e826d 100644 --- a/lib/views/pages/user/visits/visit_details.dart +++ b/lib/views/pages/user/visits/visit_details.dart @@ -53,16 +53,18 @@ class VisitDetailsPage extends StatelessWidget { color: AColors.white, buttonSize: 42, backgroundColor: AColors.green, - onPressed: () async { - Navigator.of(context).push( - MaterialPageRoute( - builder: (_) => EditPentry( - visit: visit, - pentry: visit.pentry, - ), - ), - ); - }, + onPressed: visit?.status?.name == "Closed" || visit?.status?.name == "Complete" + ? null + : () async { + Navigator.of(context).push( + MaterialPageRoute( + builder: (_) => EditPentry( + visit: visit, + pentry: visit.pentry, + ), + ), + ); + }, ), const SizedBox(width: 42) ], diff --git a/lib/views/widgets/device_trancfer/device_transfer_info_section.dart b/lib/views/widgets/device_trancfer/device_transfer_info_section.dart index c5edceed..29f519f3 100644 --- a/lib/views/widgets/device_trancfer/device_transfer_info_section.dart +++ b/lib/views/widgets/device_trancfer/device_transfer_info_section.dart @@ -20,7 +20,6 @@ class DeviceTransferInfoSection extends StatelessWidget { Widget build(BuildContext context) { info.userName = Provider.of(context).user.username; final subtitle = AppLocalization.of(context).subtitle; - print("url:${info.engSignature}"); info.attachments ??= []; return Column( children: [ diff --git a/lib/views/widgets/equipment/single_device_picker.dart b/lib/views/widgets/equipment/single_device_picker.dart index eb5ad724..2acfae14 100644 --- a/lib/views/widgets/equipment/single_device_picker.dart +++ b/lib/views/widgets/equipment/single_device_picker.dart @@ -35,7 +35,6 @@ class _SingleDevicePickerState extends State { TextEditingController snController = TextEditingController(); _getDevice(String result, {bool isQr = false}) async { - print(result); if (result == null) return; // List devices = await _devicesProvider.getDevicesListBySN(host: _settingProvider.host, user: _userProvider.user, hospitalId: _userProvider.user.clientId, sn: result); _devicesProvider.reset(); diff --git a/lib/views/widgets/status/report/service_report_last_call.dart b/lib/views/widgets/status/report/service_report_last_call.dart index 10919fb8..42a732ba 100644 --- a/lib/views/widgets/status/report/service_report_last_call.dart +++ b/lib/views/widgets/status/report/service_report_last_call.dart @@ -15,7 +15,6 @@ class ServiceReportLastCallsMenu extends StatelessWidget { @override Widget build(BuildContext context) { ServiceReportLastCallsProvider _menuProvider = Provider.of(context); - print("report?.callLastSituation:${report?.callLastSituation?.toMap()}"); return LoadingManager( isLoading: _menuProvider.isLoading, isFailedLoading: _menuProvider.calls == null,