main_design2.0
Sikander Saleem 2 years ago
parent 883f32d9e6
commit da286ea075

@ -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,

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

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

@ -306,7 +306,7 @@ class CreateRequestPageState extends State<CreateRequestPage> {
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;
}

Loading…
Cancel
Save