Enhancements

merge-requests/24/head
zaid_daoud 3 years ago
parent 048774bd8c
commit 42787e450e

@ -27,8 +27,8 @@ class Pentry{
Uint8List localNurseSignature; Uint8List localNurseSignature;
Uint8List localEngineerSignature; Uint8List localEngineerSignature;
Pentry({ Pentry(
this.travelingHours, {this.travelingHours,
this.timer, this.timer,
this.status, this.status,
this.ppmVisitStatus, this.ppmVisitStatus,
@ -43,8 +43,7 @@ class Pentry{
this.signatureNurse, this.signatureNurse,
this.signatureEngineer, this.signatureEngineer,
this.localNurseSignature, this.localNurseSignature,
this.localEngineerSignature this.localEngineerSignature});
});
bool validate() { bool validate() {
if (actualVisitDate == null) return false; if (actualVisitDate == null) return false;
@ -56,8 +55,6 @@ class Pentry{
return true; return true;
} }
Map<String, dynamic> toMap(int visitId) { Map<String, dynamic> toMap(int visitId) {
Map<String, dynamic> map = {}; Map<String, dynamic> map = {};
map["visitStatusId"] = ppmVisitStatus?.id.toString(); map["visitStatusId"] = ppmVisitStatus?.id.toString();
@ -73,9 +70,7 @@ class Pentry{
} }
if (imageFile != null) { if (imageFile != null) {
map["vAttachments"] = [ map["vAttachments"] = [
{ {"attachmentName": (imageFile.path.split("/").last + base64Encode(imageFile.readAsBytesSync()))}
"attachmentName":(imageFile.path.split("/").last+base64Encode(imageFile.readAsBytesSync()))
}
]; ];
} }
@ -89,8 +84,8 @@ class Pentry{
map["vChecklists"] = ppmCheckLists.map((e) => e.toMap(visitId)).toList(); map["vChecklists"] = ppmCheckLists.map((e) => e.toMap(visitId)).toList();
map["vCalibrationTools"] = calibrationTools.map((e) => e.toMap(visitId)).toList(); map["vCalibrationTools"] = calibrationTools.map((e) => e.toMap(visitId)).toList();
map["vKits"] = pmKits.map((e) => e.toMap(visitId)).toList(); map["vKits"] = pmKits.map((e) => e.toMap(visitId)).toList();
map["nurseSignature"] = signatureNurse; map["nurseSignature"] = "${DateTime.now().toIso8601String()}.png|$signatureNurse";
map["engSignature"] = signatureEngineer; map["engSignature"] = "${DateTime.now().toIso8601String()}.png|$signatureEngineer";
return map; return map;
} }
@ -104,23 +99,17 @@ class Pentry{
List<PMKit> pmKits = []; List<PMKit> pmKits = [];
if (map['vKits'] != null) { if (map['vKits'] != null) {
pmKits =(map['vKits'] as List<dynamic>) pmKits = (map['vKits'] as List<dynamic>).map((e) => PMKit.fromMap(e as Map<String, dynamic>)).toList();
.map((e) => PMKit.fromMap(e as Map<String, dynamic>))
.toList();
} }
List<PPMCheckList> ppmCheckLists = []; List<PPMCheckList> ppmCheckLists = [];
if (map['vChecklists'] != null) { if (map['vChecklists'] != null) {
ppmCheckLists =(map['vChecklists'] as List<dynamic>) ppmCheckLists = (map['vChecklists'] as List<dynamic>).map((e) => PPMCheckList.fromMap(e as Map<String, dynamic>)).toList();
.map((e) => PPMCheckList.fromMap(e as Map<String, dynamic>))
.toList();
} }
List<CalibrationTool> calibrationTools = []; List<CalibrationTool> calibrationTools = [];
if (map['vCalibrationTools'] != null) { if (map['vCalibrationTools'] != null) {
calibrationTools =(map['vCalibrationTools'] as List<dynamic>) calibrationTools = (map['vCalibrationTools'] as List<dynamic>).map((e) => CalibrationTool.fromMap(e as Map<String, dynamic>)).toList();
.map((e) => CalibrationTool.fromMap(e as Map<String, dynamic>))
.toList();
} }
return Pentry( return Pentry(
status: Lookup(id: map["taskStatusId"], name: map["taskStatusName"]), status: Lookup(id: map["taskStatusId"], name: map["taskStatusName"]),
@ -128,11 +117,7 @@ class Pentry{
actualVisitDate: DateTime.tryParse(map["actualDate"] ?? ""), actualVisitDate: DateTime.tryParse(map["actualDate"] ?? ""),
expectedVisitDate: DateTime.tryParse(map["expectedDate"] ?? ""), expectedVisitDate: DateTime.tryParse(map["expectedDate"] ?? ""),
travelingHours: map["travelingHours"], travelingHours: map["travelingHours"],
timer: TimerModel( timer: TimerModel(startAt: DateTime.tryParse(map["startDate"] ?? ""), endAt: DateTime.tryParse(map["endDate"] ?? ""), durationInSecond: (int.tryParse(map["workingHours"] ?? "") ?? 0) * 60 * 60),
startAt: DateTime.tryParse(map["startDate"] ?? ""),
endAt: DateTime.tryParse(map["endDate"] ?? ""),
durationInSecond: (int.tryParse(map["workingHours"] ?? "") ?? 0) * 60 *60
),
// contacts: contacts, // contacts: contacts,
ppmCheckLists: ppmCheckLists, ppmCheckLists: ppmCheckLists,
calibrationTools: calibrationTools, calibrationTools: calibrationTools,
@ -170,7 +155,6 @@ class Pentry{
calibrationTools: calibrationTools ?? this.calibrationTools?.map((e) => e.copyWith())?.toList(), calibrationTools: calibrationTools ?? this.calibrationTools?.map((e) => e.copyWith())?.toList(),
pmKits: pmKits ?? this.pmKits.map((e) => e.copyWith()).toList(), pmKits: pmKits ?? this.pmKits.map((e) => e.copyWith()).toList(),
signatureNurse: signatureNurse ?? this.signatureNurse, signatureNurse: signatureNurse ?? this.signatureNurse,
signatureEngineer: signatureEngineer ?? this.signatureEngineer signatureEngineer: signatureEngineer ?? this.signatureEngineer);
);
} }
} }

@ -19,7 +19,7 @@ class PPMCheckList{
return { return {
'id': id ?? 0, 'id': id ?? 0,
"visitId": visitId, "visitId": visitId,
if(status != null) 'taskStatusId': status?.id.toString(), if (status != null) 'taskStatusId': status?.id,
if (title != null) 'task': title, if (title != null) 'task': title,
if (comment != null) 'taskComment': comment, if (comment != null) 'taskComment': comment,
if (measuredValue != null) 'measuredValue': measuredValue, if (measuredValue != null) 'measuredValue': measuredValue,

Loading…
Cancel
Save