From c0f801c1c1984568c61e35251cc3b5315c882852 Mon Sep 17 00:00:00 2001 From: zaid_daoud Date: Mon, 5 Jun 2023 10:15:44 +0300 Subject: [PATCH] Review Comment in Add Work Order Screen --- .../providers/api/service_requests_provider.dart | 4 ++-- lib/models/service_report.dart | 4 ++++ lib/views/pages/user/requests/create_request.dart | 7 +++---- .../pages/user/requests/report/create_service_report.dart | 8 +++----- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/lib/controllers/providers/api/service_requests_provider.dart b/lib/controllers/providers/api/service_requests_provider.dart index d8c01d6f..9ed361c8 100644 --- a/lib/controllers/providers/api/service_requests_provider.dart +++ b/lib/controllers/providers/api/service_requests_provider.dart @@ -323,7 +323,7 @@ class ServiceRequestsProvider extends ChangeNotifier { "travelingHours": report.travelingHours, "travelingExpenses": report.travelingExpense ?? 0, "faultDescription": { - "id": report.faultDescriptionId ?? 0, + "id": report.faultDescriptionId, "defectName": report.type?.name, "workPerformed": report.workPreformed, "estimatedTime": report.operatingHours, @@ -337,7 +337,7 @@ class ServiceRequestsProvider extends ChangeNotifier { }, ) ?.toList(), - "reviewComment": "", + "reviewComment": report.reviewComment ?? "", "comment": report.comment, "attachmentsWorkOrder": request.devicePhotos?.map((e) => {"name": e})?.toList(), "equipmentStatus": report.status?.toMap(), diff --git a/lib/models/service_report.dart b/lib/models/service_report.dart index 7024bd49..1fca48b5 100644 --- a/lib/models/service_report.dart +++ b/lib/models/service_report.dart @@ -40,6 +40,7 @@ class ServiceReport { Uint8List localNurseSignature; Uint8List localEngineerSignature; int travelingExpense; + String reviewComment; ServiceReport({ this.id, @@ -72,6 +73,7 @@ class ServiceReport { this.repairLocation, this.travelingExpense, this.startDate, + this.reviewComment, }); Map toMap(ServiceRequest request) { @@ -129,6 +131,7 @@ class ServiceReport { _map["startofWorkTime"] = startDate; _map["endofWorkTime"] = endDate; _map["workingHours"] = endDate?.difference(startDate)?.inHours ?? 0; + _map["reviewComment"] = reviewComment; return _map; } @@ -186,6 +189,7 @@ class ServiceReport { device: Device.fromJson(parsedJson["callRequest"]["asset"]), signatureNurse: URLs.getFileUrl(parsedJson["nurseSignature"]), signatureEngineer: URLs.getFileUrl(parsedJson["engSignature"]), + reviewComment: parsedJson['reviewComment'], ); } diff --git a/lib/views/pages/user/requests/create_request.dart b/lib/views/pages/user/requests/create_request.dart index efe3959c..569eeff9 100644 --- a/lib/views/pages/user/requests/create_request.dart +++ b/lib/views/pages/user/requests/create_request.dart @@ -14,7 +14,6 @@ import 'package:test_sa/controllers/validator/validator.dart'; import 'package:test_sa/extensions/int_extensions.dart'; import 'package:test_sa/extensions/widget_extensions.dart'; import 'package:test_sa/models/device/device.dart'; -import 'package:test_sa/models/lookup.dart'; import 'package:test_sa/models/service_request/service_request.dart'; import 'package:test_sa/models/subtitle.dart'; import 'package:test_sa/views/app_style/colors.dart'; @@ -271,7 +270,7 @@ class CreateRequestPageState extends State { initialValue: _serviceRequest.callComments, hintText: _subtitle.maintenanceIssue, prefixIconData: FontAwesomeIcons.triangleExclamation, - style: Theme.of(context).textTheme.headline6, + style: Theme.of(context).textTheme.titleLarge, textInputType: TextInputType.multiline, validator: (value) => Validator.hasValue(value) ? null : _subtitle.maintenanceIssueRequired, onSaved: (value) { @@ -286,12 +285,12 @@ class CreateRequestPageState extends State { if (widget.serviceRequest != null) ATextFormField( controller: _commentController, - initialValue: _serviceRequest.comment, + initialValue: _serviceRequest.comments, hintText: _subtitle.comment, style: Theme.of(context).textTheme.titleMedium, textInputType: TextInputType.multiline, onSaved: (value) { - _serviceRequest.comment = value; + _serviceRequest.comments = value; }, ), ], 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 0426001e..dfc0beca 100644 --- a/lib/views/pages/user/requests/report/create_service_report.dart +++ b/lib/views/pages/user/requests/report/create_service_report.dart @@ -28,12 +28,10 @@ import 'package:test_sa/views/widgets/images/mini_one_image_picker.dart'; import 'package:test_sa/views/widgets/loaders/loading_manager.dart'; import 'package:test_sa/views/widgets/parts/auto_complete_parts_field.dart'; import 'package:test_sa/views/widgets/parts/part_item.dart'; -import 'package:test_sa/views/widgets/status/employee/engineers_mune.dart'; import 'package:test_sa/views/widgets/status/report/service_report_last_call.dart'; import 'package:test_sa/views/widgets/status/report/service_report_reasons.dart'; import 'package:test_sa/views/widgets/status/report/service_report_status.dart'; import 'package:test_sa/views/widgets/status/report/service_status.dart'; -import 'package:test_sa/views/widgets/timer/app_timer.dart'; import 'package:test_sa/views/widgets/titles/app_sub_title.dart'; import '../../../../widgets/speech_to_text/speech_to_text.dart'; @@ -339,13 +337,13 @@ class _CreateServiceReportState extends State with TickerPr ), if (_showCommentField) ATextFormField( - initialValue: _serviceReport?.comment, - hintText: _subtitle.comment, + initialValue: _serviceReport?.reviewComment, + hintText: "Review Comment", textAlign: TextAlign.center, style: Theme.of(context).textTheme.titleMedium, textInputType: TextInputType.multiline, onSaved: (value) { - _serviceReport.comment = value; + _serviceReport.reviewComment = value; }, ), SizedBox(