Merge branch 'main_latest_merged' into zaid_development_new

main_design2.0
zaid_daoud 3 years ago
commit 6ebbceedd0

@ -227,8 +227,8 @@ class ServiceRequestsProvider extends ChangeNotifier {
"id": request.id, "id": request.id,
"callNo": serviceRequest['callNo'], "callNo": serviceRequest['callNo'],
"callCreatedBy": serviceRequest['callCreatedBy'], "callCreatedBy": serviceRequest['callCreatedBy'],
"requestedDate": date?.toIso8601String() ?? "", "requestedDate": request.date ?? "",
"requestedTime": date?.toIso8601String() ?? "", "requestedTime": request.date ?? "",
"priority": request.priority?.toMap(), "priority": request.priority?.toMap(),
"defectType": request.defectType?.toMap(), "defectType": request.defectType?.toMap(),
"typeofRequest": request.type?.toMap(), "typeofRequest": request.type?.toMap(),
@ -259,7 +259,7 @@ class ServiceRequestsProvider extends ChangeNotifier {
"firstAction": request.firstAction?.toMap(), "firstAction": request.firstAction?.toMap(),
"loanAvailablity": request.loanAvailability?.toMap(), "loanAvailablity": request.loanAvailability?.toMap(),
"comments": request.reviewComment, "comments": request.reviewComment,
"firstActionDate": serviceRequest['firstActionDate'], "firstActionDate": date?.toIso8601String(),
"visitDate": date?.toIso8601String() ?? "", "visitDate": date?.toIso8601String() ?? "",
"callReview": null, "callReview": null,
"reviewComment": null, "reviewComment": null,

@ -7,6 +7,7 @@ class Device {
int id; int id;
String serialNumber; String serialNumber;
String number; String number;
String assetName;
String destBuildingName; String destBuildingName;
String destDepartmentName; String destDepartmentName;
String destRoom; String destRoom;
@ -21,6 +22,7 @@ class Device {
this.id, this.id,
this.serialNumber, this.serialNumber,
this.number, this.number,
this.assetName,
this.hospital, this.hospital,
this.destBuildingName, this.destBuildingName,
this.destDepartmentName, this.destDepartmentName,
@ -33,10 +35,12 @@ class Device {
}); });
factory Device.fromJson(Map<String, dynamic> parsedJson) { factory Device.fromJson(Map<String, dynamic> parsedJson) {
print("parsedJson:$parsedJson");
return Device( return Device(
id: parsedJson["id"], id: parsedJson["id"],
serialNumber: parsedJson["assetSerialNo"], serialNumber: parsedJson["assetSerialNo"],
number: parsedJson["assetNumber"], number: parsedJson["assetNumber"],
assetName: parsedJson["assetName"],
modelDefinition: ModelDefinition.fromJson(parsedJson["modelDefinition"]), modelDefinition: ModelDefinition.fromJson(parsedJson["modelDefinition"]),
hospital: Hospital.fromJson(parsedJson["site"]), hospital: Hospital.fromJson(parsedJson["site"]),
destBuildingName: parsedJson["destBuildingName"], destBuildingName: parsedJson["destBuildingName"],
@ -66,6 +70,7 @@ class Device {
'id': id, 'id': id,
'assetSerialNo': serialNumber, 'assetSerialNo': serialNumber,
'assetNumber': number, 'assetNumber': number,
'assetName': assetName,
'modelDefinition': modelDefinition.toJson(), 'modelDefinition': modelDefinition.toJson(),
'site': hospital.toMap(), 'site': hospital.toMap(),
'AssetType': assetType.toMap(), 'AssetType': assetType.toMap(),

@ -50,6 +50,7 @@ class DeviceTransfer {
device: Device( device: Device(
id: parsedJson["assetId"], id: parsedJson["assetId"],
number: parsedJson["assetNumber"], number: parsedJson["assetNumber"],
assetName: parsedJson["assetName"],
serialNumber: parsedJson["assetSerialNo"], serialNumber: parsedJson["assetSerialNo"],
destBuildingName: parsedJson["destBuildingName"], destBuildingName: parsedJson["destBuildingName"],
destDepartmentName: parsedJson["destDepartmentName"], destDepartmentName: parsedJson["destDepartmentName"],

@ -104,7 +104,7 @@ class ServiceReport {
// "workPerformed":workPreformed // "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 (travelingHours != null) _map["travelingHours"] = travelingHours;
// if (workingHours != null) _map["workingHours"] = workingHours; // if (workingHours != null) _map["workingHours"] = workingHours;
// if (workPreformed != null && workPreformed.isNotEmpty) { // if (workPreformed != null && workPreformed.isNotEmpty) {

@ -82,6 +82,7 @@ class ServiceRequest {
factory ServiceRequest.fromJson(Map<String, dynamic> parsedJson) { factory ServiceRequest.fromJson(Map<String, dynamic> parsedJson) {
List<String> images = []; List<String> images = [];
if(parsedJson["attachmentsCallRequest"]!=null)
if (parsedJson["attachmentsCallRequest"] is List) { if (parsedJson["attachmentsCallRequest"] is List) {
List list = parsedJson["attachmentsCallRequest"]; List list = parsedJson["attachmentsCallRequest"];
images = list.map((e) => URLs.getFileUrl(e["attachmentsCallRequest"])).toList(); images = list.map((e) => URLs.getFileUrl(e["attachmentsCallRequest"])).toList();
@ -98,6 +99,7 @@ class ServiceRequest {
devicePhotos: images, devicePhotos: images,
deviceSerialNumber: parsedJson["asset"]["assetSerialNo"], deviceSerialNumber: parsedJson["asset"]["assetSerialNo"],
date: DateTime.tryParse(parsedJson["requestedDate"] ?? "").toString().split(" ").first, date: DateTime.tryParse(parsedJson["requestedDate"] ?? "").toString().split(" ").first,
// todo. add requeste time param for time
callComments: parsedJson["callComments"], callComments: parsedJson["callComments"],
comments: parsedJson["comments"], comments: parsedJson["comments"],
statusLabel: parsedJson["status"] == null ? null : parsedJson["status"]["name"], statusLabel: parsedJson["status"] == null ? null : parsedJson["status"]["name"],

@ -89,12 +89,12 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
RequestInfoRow( RequestInfoRow(
title: "Id", title: "Transfer Id",
info: widget.model.id?.toString(), info: widget.model.title?.toString(),
), ),
RequestInfoRow( RequestInfoRow(
title: _subtitle.assetName, title: _subtitle.assetName,
info: widget.model.title, info: widget.model.device.assetName,
), ),
RequestInfoRow( RequestInfoRow(
title: _subtitle.assetSN, title: _subtitle.assetSN,

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

Loading…
Cancel
Save