Merge branch 'main_latest_merged' into zaid_development_new

main_design2.0
zaid_daoud 2 years ago
commit 58bd5075ed

@ -336,7 +336,7 @@ class ServiceRequestsProvider extends ChangeNotifier {
}, },
) )
?.toList(), ?.toList(),
"reviewComment": report.reviewComment ?? "", "reviewComment": "",
"comment": report.comment, "comment": report.comment,
"attachmentsWorkOrder": request.devicePhotos?.map((e) => {"name": e})?.toList(), "attachmentsWorkOrder": request.devicePhotos?.map((e) => {"name": e})?.toList(),
"equipmentStatus": report.equipmentStatus?.toMap(), "equipmentStatus": report.equipmentStatus?.toMap(),

@ -101,8 +101,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"] = "${DateTime.now().toIso8601String()}.png|$signatureNurse"; map["nurseSignature"] = signatureNurse;//"${DateTime.now().toIso8601String()}.png|$signatureNurse";
map["engSignature"] = "${DateTime.now().toIso8601String()}.png|$signatureEngineer"; map["engSignature"] = signatureEngineer;//"${DateTime.now().toIso8601String()}.png|$signatureEngineer";
return map; return map;
} }

@ -397,21 +397,21 @@ class _CreateServiceReportState extends State<CreateServiceReport> with TickerPr
), ),
], ],
), ),
if (_showCommentField) // if (_showCommentField)
const SizedBox( // const SizedBox(
height: 8, // height: 8,
), // ),
if (_showCommentField) // if (_showCommentField)
ATextFormField( // ATextFormField(
initialValue: _serviceReport?.reviewComment, // initialValue: _serviceReport?.reviewComment,
hintText: "Review Comment", // hintText: "Review Comment",
textAlign: TextAlign.center, // textAlign: TextAlign.center,
style: Theme.of(context).textTheme.titleMedium, // style: Theme.of(context).textTheme.titleMedium,
textInputType: TextInputType.multiline, // textInputType: TextInputType.multiline,
onSaved: (value) { // onSaved: (value) {
_serviceReport.reviewComment = value; // _serviceReport.reviewComment = value;
}, // },
), // ),
SizedBox( SizedBox(
height: 8 * AppStyle.getScaleFactor(context), height: 8 * AppStyle.getScaleFactor(context),
), ),

Loading…
Cancel
Save