diff --git a/lib/controllers/providers/api/gas_refill_provider.dart b/lib/controllers/providers/api/gas_refill_provider.dart index bd3cd270..cbd66b55 100644 --- a/lib/controllers/providers/api/gas_refill_provider.dart +++ b/lib/controllers/providers/api/gas_refill_provider.dart @@ -142,19 +142,19 @@ class GasRefillProvider extends ChangeNotifier { @required GasRefillModel oldModel, @required GasRefillModel newModel, }) async { + print("${oldModel?.id} assigned EEEEE ${oldModel?.assignedEmployee?.toJson()}"); Map body = { "id": newModel.id, "gazRefillNo": newModel.title ?? "", "status": newModel.status.toMap(), + "expectedDate": oldModel.expectedDate?.toIso8601String(), + "expectedTime": oldModel.expectedDate?.toIso8601String(), "startDate": startDate?.toIso8601String(), "startTime": startDate?.toIso8601String(), "endDate": endDate?.toIso8601String(), "endTime": endDate?.toIso8601String(), - // "workingHours": 0, - // "assignedEmployee": { - // "id": "string", - // "name": "string" - // }, + "workingHours": ((endDate?.difference(startDate)?.inMinutes ?? 0) / 60), + "assignedEmployee": oldModel?.assignedEmployee?.toJson(), "site": hospital?.toMap(), "building": building?.toJson(includeFloors: false), "floor": floor?.toJson(includeDepartments: false), diff --git a/lib/models/gas_refill/gas_refill_model.dart b/lib/models/gas_refill/gas_refill_model.dart index 4effc27f..ad2ebde2 100644 --- a/lib/models/gas_refill/gas_refill_model.dart +++ b/lib/models/gas_refill/gas_refill_model.dart @@ -13,6 +13,7 @@ class GasRefillModel { Lookup floor; Department department; List details; + AssignedEmployee assignedEmployee; DateTime startDate, endDate, expectedDate; GasRefillModel({ @@ -28,6 +29,7 @@ class GasRefillModel { this.endDate, this.expectedDate, this.department, + this.assignedEmployee, }); bool validate() { @@ -55,6 +57,7 @@ class GasRefillModel { startDate = model.startDate; endDate = model.endDate; expectedDate = model.expectedDate; + assignedEmployee = model.assignedEmployee; } factory GasRefillModel.fromJson(Map parsedJson) { @@ -63,6 +66,7 @@ class GasRefillModel { List list = parsedJson["gazRefillDetails"]; details = list.map((e) => GasRefillDetails.fromJson(e)).toList(); } + print("${parsedJson['assignedEmployee']}ddddd"); return GasRefillModel( id: parsedJson["id"], //userId: parsedJson["uid"], @@ -76,6 +80,7 @@ class GasRefillModel { startDate: DateTime.tryParse(parsedJson['startDate'] ?? ""), endDate: DateTime.tryParse(parsedJson['endDate'] ?? ""), expectedDate: DateTime.tryParse(parsedJson['expectedDate'] ?? ""), + assignedEmployee: AssignedEmployee.fromJson(parsedJson['assignedEmployee'] ?? {}), ); } }