From b40727b92079442416dd22d282c0b48ed856f097 Mon Sep 17 00:00:00 2001 From: nextwo <1234> Date: Thu, 13 Jul 2023 08:20:24 +0300 Subject: [PATCH 1/2] review comment --- .../api/service_requests_provider.dart | 2 +- .../pages/user/requests/create_request.dart | 2 +- .../report/create_service_report.dart | 30 +++++++++---------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/lib/controllers/providers/api/service_requests_provider.dart b/lib/controllers/providers/api/service_requests_provider.dart index edf5a749..8f89d695 100644 --- a/lib/controllers/providers/api/service_requests_provider.dart +++ b/lib/controllers/providers/api/service_requests_provider.dart @@ -336,7 +336,7 @@ class ServiceRequestsProvider extends ChangeNotifier { }, ) ?.toList(), - "reviewComment": report.reviewComment ?? "", + "reviewComment": "", "comment": report.comment, "attachmentsWorkOrder": request.devicePhotos?.map((e) => {"name": e})?.toList(), "equipmentStatus": report.equipmentStatus?.toMap(), diff --git a/lib/views/pages/user/requests/create_request.dart b/lib/views/pages/user/requests/create_request.dart index bcd45204..63c426e0 100644 --- a/lib/views/pages/user/requests/create_request.dart +++ b/lib/views/pages/user/requests/create_request.dart @@ -306,7 +306,7 @@ class CreateRequestPageState extends State { 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; } diff --git a/lib/views/pages/user/requests/report/create_service_report.dart b/lib/views/pages/user/requests/report/create_service_report.dart index 8ff8b431..4eac7042 100644 --- a/lib/views/pages/user/requests/report/create_service_report.dart +++ b/lib/views/pages/user/requests/report/create_service_report.dart @@ -397,21 +397,21 @@ class _CreateServiceReportState extends State with TickerPr ), ], ), - if (_showCommentField) - const SizedBox( - height: 8, - ), - if (_showCommentField) - ATextFormField( - initialValue: _serviceReport?.reviewComment, - hintText: "Review Comment", - textAlign: TextAlign.center, - style: Theme.of(context).textTheme.titleMedium, - textInputType: TextInputType.multiline, - onSaved: (value) { - _serviceReport.reviewComment = value; - }, - ), + // if (_showCommentField) + // const SizedBox( + // height: 8, + // ), + // if (_showCommentField) + // ATextFormField( + // initialValue: _serviceReport?.reviewComment, + // hintText: "Review Comment", + // textAlign: TextAlign.center, + // style: Theme.of(context).textTheme.titleMedium, + // textInputType: TextInputType.multiline, + // onSaved: (value) { + // _serviceReport.reviewComment = value; + // }, + // ), SizedBox( height: 8 * AppStyle.getScaleFactor(context), ), From 5de7b1b75903d93348f768290690bc86d57c9816 Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Thu, 13 Jul 2023 15:42:22 +0300 Subject: [PATCH 2/2] pm entry nurse & eng signature fix. --- lib/models/pantry/pentry.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/models/pantry/pentry.dart b/lib/models/pantry/pentry.dart index 5d3a4163..28f1d8e6 100644 --- a/lib/models/pantry/pentry.dart +++ b/lib/models/pantry/pentry.dart @@ -101,8 +101,8 @@ class Pentry { map["vChecklists"] = ppmCheckLists.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["nurseSignature"] = "${DateTime.now().toIso8601String()}.png|$signatureNurse"; - map["engSignature"] = "${DateTime.now().toIso8601String()}.png|$signatureEngineer"; + map["nurseSignature"] = signatureNurse;//"${DateTime.now().toIso8601String()}.png|$signatureNurse"; + map["engSignature"] = signatureEngineer;//"${DateTime.now().toIso8601String()}.png|$signatureEngineer"; return map; }