From f583151345d25cb7fefb1293316ea3f27d3905b9 Mon Sep 17 00:00:00 2001 From: nextwo <1234> Date: Wed, 12 Jul 2023 09:11:08 +0300 Subject: [PATCH 1/4] show images in the app + search list issue --- lib/views/pages/device_transfer/update_device_transfer.dart | 3 ++- lib/views/widgets/equipment/single_device_picker.dart | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/views/pages/device_transfer/update_device_transfer.dart b/lib/views/pages/device_transfer/update_device_transfer.dart index 061b5d21..bf722b0d 100644 --- a/lib/views/pages/device_transfer/update_device_transfer.dart +++ b/lib/views/pages/device_transfer/update_device_transfer.dart @@ -190,7 +190,8 @@ class _UpdateDeviceTransferState extends State { const SizedBox( height: 8, ), - const ASubTitle("Signature"), + //const ASubTitle("Signature"), + Text("widget.model.sender.signature"), // if(_validate && _formModel.signature == null) // ASubTitle(_subtitle.requiredWord,color: Colors.red,), const SizedBox( diff --git a/lib/views/widgets/equipment/single_device_picker.dart b/lib/views/widgets/equipment/single_device_picker.dart index 722d2f21..508601bd 100644 --- a/lib/views/widgets/equipment/single_device_picker.dart +++ b/lib/views/widgets/equipment/single_device_picker.dart @@ -27,6 +27,7 @@ class _SingleDevicePickerState extends State { UserProvider _userProvider; SettingProvider _settingProvider; List _searchableList = []; + List _initList = []; bool _firstTime = true; Subtitle _subtitle; @@ -58,6 +59,7 @@ class _SingleDevicePickerState extends State { void dispose() { numberController.dispose(); snController.dispose(); + _devicesProvider.reset(); super.dispose(); } @@ -70,6 +72,7 @@ class _SingleDevicePickerState extends State { if (_firstTime && _devicesProvider.devices != null) { _searchableList.clear(); _searchableList.addAll(_devicesProvider.devices); + _initList.addAll(_devicesProvider.devices); } _subtitle = AppLocalization.of(context).subtitle; return Scaffold( From d4ea2d4c58c8d603df705c8ac82a7261acf38f2e Mon Sep 17 00:00:00 2001 From: nextwo <1234> Date: Wed, 12 Jul 2023 09:36:21 +0300 Subject: [PATCH 2/4] show images in the app + search list issue --- lib/views/pages/device_transfer/update_device_transfer.dart | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/views/pages/device_transfer/update_device_transfer.dart b/lib/views/pages/device_transfer/update_device_transfer.dart index bf722b0d..061b5d21 100644 --- a/lib/views/pages/device_transfer/update_device_transfer.dart +++ b/lib/views/pages/device_transfer/update_device_transfer.dart @@ -190,8 +190,7 @@ class _UpdateDeviceTransferState extends State { const SizedBox( height: 8, ), - //const ASubTitle("Signature"), - Text("widget.model.sender.signature"), + const ASubTitle("Signature"), // if(_validate && _formModel.signature == null) // ASubTitle(_subtitle.requiredWord,color: Colors.red,), const SizedBox( From da286ea075ef32ac1ed6a308e9e13221a010f825 Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Wed, 12 Jul 2023 17:33:04 +0300 Subject: [PATCH 3/4] fixes --- .../providers/api/service_requests_provider.dart | 6 +++--- lib/models/service_report.dart | 2 +- lib/models/service_request/service_request.dart | 2 ++ lib/views/pages/user/requests/create_request.dart | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/controllers/providers/api/service_requests_provider.dart b/lib/controllers/providers/api/service_requests_provider.dart index edf5a749..eadd6340 100644 --- a/lib/controllers/providers/api/service_requests_provider.dart +++ b/lib/controllers/providers/api/service_requests_provider.dart @@ -227,8 +227,8 @@ class ServiceRequestsProvider extends ChangeNotifier { "id": request.id, "callNo": serviceRequest['callNo'], "callCreatedBy": serviceRequest['callCreatedBy'], - "requestedDate": date?.toIso8601String() ?? "", - "requestedTime": date?.toIso8601String() ?? "", + "requestedDate": request.date ?? "", + "requestedTime": request.date ?? "", "priority": request.priority?.toMap(), "defectType": request.defectType?.toMap(), "typeofRequest": request.type?.toMap(), @@ -259,7 +259,7 @@ class ServiceRequestsProvider extends ChangeNotifier { "firstAction": request.firstAction?.toMap(), "loanAvailablity": request.loanAvailability?.toMap(), "comments": request.reviewComment, - "firstActionDate": serviceRequest['firstActionDate'], + "firstActionDate": date?.toIso8601String(), "visitDate": date?.toIso8601String() ?? "", "callReview": null, "reviewComment": null, diff --git a/lib/models/service_report.dart b/lib/models/service_report.dart index 0ad3b7ad..a8284224 100644 --- a/lib/models/service_report.dart +++ b/lib/models/service_report.dart @@ -104,7 +104,7 @@ class ServiceReport { // "workPerformed":workPreformed // }; // } - _map["faultDescription"] = {"id": faultDescription?.id ?? 0, "workPerformed": faultDescription?.workPerformed}; + _map["faultDescription"] = faultDescription?.id ==null ? null :{"id": faultDescription?.id ?? 0, "workPerformed": faultDescription?.workPerformed}; if (travelingHours != null) _map["travelingHours"] = travelingHours; // if (workingHours != null) _map["workingHours"] = workingHours; // if (workPreformed != null && workPreformed.isNotEmpty) { diff --git a/lib/models/service_request/service_request.dart b/lib/models/service_request/service_request.dart index 58fc2808..36885189 100644 --- a/lib/models/service_request/service_request.dart +++ b/lib/models/service_request/service_request.dart @@ -82,6 +82,7 @@ class ServiceRequest { factory ServiceRequest.fromJson(Map parsedJson) { List images = []; + if(parsedJson["attachmentsCallRequest"]!=null) if (parsedJson["attachmentsCallRequest"] is List) { List list = parsedJson["attachmentsCallRequest"]; images = list.map((e) => URLs.getFileUrl(e["attachmentsCallRequest"])).toList(); @@ -98,6 +99,7 @@ class ServiceRequest { devicePhotos: images, deviceSerialNumber: parsedJson["asset"]["assetSerialNo"], date: DateTime.tryParse(parsedJson["requestedDate"] ?? "").toString().split(" ").first, + // todo. add requeste time param for time callComments: parsedJson["callComments"], comments: parsedJson["comments"], statusLabel: parsedJson["status"] == null ? null : parsedJson["status"]["name"], diff --git a/lib/views/pages/user/requests/create_request.dart b/lib/views/pages/user/requests/create_request.dart index bcd45204..63c426e0 100644 --- a/lib/views/pages/user/requests/create_request.dart +++ b/lib/views/pages/user/requests/create_request.dart @@ -306,7 +306,7 @@ class CreateRequestPageState extends State { Fluttertoast.showToast(msg: _subtitle.pickDevice); return; } - if (_serviceRequest.firstAction.name == "Need a visit" && _dateTime == null) { + if (_serviceRequest.firstAction?.name == "Need a visit" && _dateTime == null) { Fluttertoast.showToast(msg: _subtitle.noDateFound); return; } From 8ada0dd0af05c0aa00dcaf4d652055d0af858831 Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Thu, 13 Jul 2023 08:46:25 +0300 Subject: [PATCH 4/4] fixes-1 --- lib/models/device/device.dart | 5 +++++ lib/models/device/device_transfer.dart | 1 + .../pages/device_transfer/device_transfer_details.dart | 6 +++--- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/models/device/device.dart b/lib/models/device/device.dart index 113e928e..40d2f92b 100644 --- a/lib/models/device/device.dart +++ b/lib/models/device/device.dart @@ -7,6 +7,7 @@ class Device { int id; String serialNumber; String number; + String assetName; String destBuildingName; String destDepartmentName; String destRoom; @@ -21,6 +22,7 @@ class Device { this.id, this.serialNumber, this.number, + this.assetName, this.hospital, this.destBuildingName, this.destDepartmentName, @@ -33,10 +35,12 @@ class Device { }); factory Device.fromJson(Map parsedJson) { + print("parsedJson:$parsedJson"); return Device( id: parsedJson["id"], serialNumber: parsedJson["assetSerialNo"], number: parsedJson["assetNumber"], + assetName: parsedJson["assetName"], modelDefinition: ModelDefinition.fromJson(parsedJson["modelDefinition"]), hospital: Hospital.fromJson(parsedJson["site"]), destBuildingName: parsedJson["destBuildingName"], @@ -66,6 +70,7 @@ class Device { 'id': id, 'assetSerialNo': serialNumber, 'assetNumber': number, + 'assetName': assetName, 'modelDefinition': modelDefinition.toJson(), 'site': hospital.toMap(), 'AssetType': assetType.toMap(), diff --git a/lib/models/device/device_transfer.dart b/lib/models/device/device_transfer.dart index 9c0d3e28..ec1d5bfb 100644 --- a/lib/models/device/device_transfer.dart +++ b/lib/models/device/device_transfer.dart @@ -50,6 +50,7 @@ class DeviceTransfer { device: Device( id: parsedJson["assetId"], number: parsedJson["assetNumber"], + assetName: parsedJson["assetName"], serialNumber: parsedJson["assetSerialNo"], destBuildingName: parsedJson["destBuildingName"], destDepartmentName: parsedJson["destDepartmentName"], diff --git a/lib/views/pages/device_transfer/device_transfer_details.dart b/lib/views/pages/device_transfer/device_transfer_details.dart index e9d0a93d..4d6e7e24 100644 --- a/lib/views/pages/device_transfer/device_transfer_details.dart +++ b/lib/views/pages/device_transfer/device_transfer_details.dart @@ -89,12 +89,12 @@ class _DeviceTransferDetailsState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ RequestInfoRow( - title: "Id", - info: widget.model.id?.toString(), + title: "Transfer Id", + info: widget.model.title?.toString(), ), RequestInfoRow( title: _subtitle.assetName, - info: widget.model.title, + info: widget.model.device.assetName, ), RequestInfoRow( title: _subtitle.assetSN,