From b908322f066278beb66f47f7fe70441b24a24cb9 Mon Sep 17 00:00:00 2001 From: zaid_daoud Date: Thu, 31 Aug 2023 11:12:08 +0300 Subject: [PATCH] 1- [WO Details] Get Vendor Name And Engineer According To Last Status --- .../service_request/search_work_order.dart | 2 ++ .../sub_work_order_details.dart | 22 ++++++++++++++++--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/lib/models/service_request/search_work_order.dart b/lib/models/service_request/search_work_order.dart index e4f9fa0..4294f49 100644 --- a/lib/models/service_request/search_work_order.dart +++ b/lib/models/service_request/search_work_order.dart @@ -327,6 +327,8 @@ class SearchWorkOrder { reason = subWoDetails.reason; faultDescription = subWoDetails.faultDescription; sparePartsWorkOrders = subWoDetails.sparePartsWorkOrders; + suppEngineerWorkOrders = subWoDetails.suppEngineerWorkOrders; + supplier = subWoDetails.supplier; } } diff --git a/lib/models/service_request/sub_work_order_details.dart b/lib/models/service_request/sub_work_order_details.dart index 4d0e553..6e58d34 100644 --- a/lib/models/service_request/sub_work_order_details.dart +++ b/lib/models/service_request/sub_work_order_details.dart @@ -1,5 +1,3 @@ -import 'dart:developer'; - import 'package:test_sa/models/lookup.dart'; import 'package:test_sa/models/service_request/search_work_order.dart'; @@ -10,25 +8,35 @@ class SubWorkOrderDetails { Lookup reason; FaultDescription faultDescription; List sparePartsWorkOrders; + List suppEngineerWorkOrders; + SupplierModel supplier; SubWorkOrderDetails({ this.equipmentStatus, this.reason, this.faultDescription, this.sparePartsWorkOrders, + this.supplier, + this.suppEngineerWorkOrders, }); SubWorkOrderDetails.fromJson(dynamic json) { if (json['equipmentStatus'] != null) equipmentStatus = Lookup.fromJson(json['equipmentStatus']); if (json['reason'] != null) reason = Lookup.fromJson(json['reason']); if (json['faultDescription'] != null) faultDescription = FaultDescription.fromJson(json['faultDescription']); - log("supplier : ${json['supplier']}"); + if (json['supplier'] != null) supplier = SupplierModel.fromJson(json['supplier']); if (json['sparePartsWorkOrders'] != null) { sparePartsWorkOrders = []; json['sparePartsWorkOrders'].forEach((v) { sparePartsWorkOrders.add(SparePartsWorkOrders.fromJson(v)); }); } + if (json['suppEngineerWorkOrders'] != null) { + suppEngineerWorkOrders = []; + json['suppEngineerWorkOrders'].forEach((v) { + suppEngineerWorkOrders.add(SuppEngineerWorkOrders.fromJson(v)); + }); + } } SubWorkOrderDetails copyWith({ @@ -36,12 +44,16 @@ class SubWorkOrderDetails { Lookup reason, FaultDescription faultDescription, List sparePartsWorkOrders, + SupplierModel supplier, + SuppEngineerWorkOrders suppEngineerWorkOrders, }) => SubWorkOrderDetails( equipmentStatus: equipmentStatus ?? this.equipmentStatus, reason: reason ?? this.reason, faultDescription: faultDescription ?? this.faultDescription, sparePartsWorkOrders: sparePartsWorkOrders ?? this.sparePartsWorkOrders, + supplier: supplier ?? this.supplier, + suppEngineerWorkOrders: suppEngineerWorkOrders ?? this.suppEngineerWorkOrders, ); Map toJson() { @@ -52,6 +64,10 @@ class SubWorkOrderDetails { if (sparePartsWorkOrders?.isNotEmpty ?? false) { map['sparePartsWorkOrders'] = sparePartsWorkOrders?.map((e) => e.toJson())?.toList(); } + if (suppEngineerWorkOrders?.isNotEmpty ?? false) { + map['suppEngineerWorkOrders'] = suppEngineerWorkOrders?.map((e) => e.toJson())?.toList(); + } + map['supplier'] = supplier?.toJson(); return map; } }