Merge branch 'main_latest_merged' into zaid_development_new

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,

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<String, dynamic> 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(),

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"],

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) {

lib/models/service_request/service_request.dart

@@ -82,6 +82,7 @@ class ServiceRequest {
 
   factory ServiceRequest.fromJson(Map<String, dynamic> parsedJson) {
     List<String> 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"],

lib/views/pages/device_transfer/device_transfer_details.dart

@@ -89,12 +89,12 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
                       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,

lib/views/widgets/equipment/single_device_picker.dart

@@ -27,6 +27,7 @@ class _SingleDevicePickerState extends State<SingleDevicePicker> {
   UserProvider _userProvider;
   SettingProvider _settingProvider;
   List<Device> _searchableList = [];
+  List<Device> _initList = [];
   bool _firstTime = true;
   Subtitle _subtitle;
 
@@ -58,6 +59,7 @@ class _SingleDevicePickerState extends State<SingleDevicePicker> {
   void dispose() {
     numberController.dispose();
     snController.dispose();
+    _devicesProvider.reset();
     super.dispose();
   }
 
@@ -70,6 +72,7 @@ class _SingleDevicePickerState extends State<SingleDevicePicker> {
     if (_firstTime && _devicesProvider.devices != null) {
       _searchableList.clear();
       _searchableList.addAll(_devicesProvider.devices);
+      _initList.addAll(_devicesProvider.devices);
     }
     _subtitle = AppLocalization.of(context).subtitle;
     return Scaffold(