Review Comment in Add Work Order Screen

merge-requests/31/head
zaid_daoud 3 years ago
parent 19edc321f5
commit c0f801c1c1

@ -323,7 +323,7 @@ class ServiceRequestsProvider extends ChangeNotifier {
"travelingHours": report.travelingHours, "travelingHours": report.travelingHours,
"travelingExpenses": report.travelingExpense ?? 0, "travelingExpenses": report.travelingExpense ?? 0,
"faultDescription": { "faultDescription": {
"id": report.faultDescriptionId ?? 0, "id": report.faultDescriptionId,
"defectName": report.type?.name, "defectName": report.type?.name,
"workPerformed": report.workPreformed, "workPerformed": report.workPreformed,
"estimatedTime": report.operatingHours, "estimatedTime": report.operatingHours,
@ -337,7 +337,7 @@ class ServiceRequestsProvider extends ChangeNotifier {
}, },
) )
?.toList(), ?.toList(),
"reviewComment": "", "reviewComment": report.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.status?.toMap(), "equipmentStatus": report.status?.toMap(),

@ -40,6 +40,7 @@ class ServiceReport {
Uint8List localNurseSignature; Uint8List localNurseSignature;
Uint8List localEngineerSignature; Uint8List localEngineerSignature;
int travelingExpense; int travelingExpense;
String reviewComment;
ServiceReport({ ServiceReport({
this.id, this.id,
@ -72,6 +73,7 @@ class ServiceReport {
this.repairLocation, this.repairLocation,
this.travelingExpense, this.travelingExpense,
this.startDate, this.startDate,
this.reviewComment,
}); });
Map<String, dynamic> toMap(ServiceRequest request) { Map<String, dynamic> toMap(ServiceRequest request) {
@ -129,6 +131,7 @@ class ServiceReport {
_map["startofWorkTime"] = startDate; _map["startofWorkTime"] = startDate;
_map["endofWorkTime"] = endDate; _map["endofWorkTime"] = endDate;
_map["workingHours"] = endDate?.difference(startDate)?.inHours ?? 0; _map["workingHours"] = endDate?.difference(startDate)?.inHours ?? 0;
_map["reviewComment"] = reviewComment;
return _map; return _map;
} }
@ -186,6 +189,7 @@ class ServiceReport {
device: Device.fromJson(parsedJson["callRequest"]["asset"]), device: Device.fromJson(parsedJson["callRequest"]["asset"]),
signatureNurse: URLs.getFileUrl(parsedJson["nurseSignature"]), signatureNurse: URLs.getFileUrl(parsedJson["nurseSignature"]),
signatureEngineer: URLs.getFileUrl(parsedJson["engSignature"]), signatureEngineer: URLs.getFileUrl(parsedJson["engSignature"]),
reviewComment: parsedJson['reviewComment'],
); );
} }

@ -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/int_extensions.dart';
import 'package:test_sa/extensions/widget_extensions.dart'; import 'package:test_sa/extensions/widget_extensions.dart';
import 'package:test_sa/models/device/device.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/service_request/service_request.dart';
import 'package:test_sa/models/subtitle.dart'; import 'package:test_sa/models/subtitle.dart';
import 'package:test_sa/views/app_style/colors.dart'; import 'package:test_sa/views/app_style/colors.dart';
@ -271,7 +270,7 @@ class CreateRequestPageState extends State<CreateRequestPage> {
initialValue: _serviceRequest.callComments, initialValue: _serviceRequest.callComments,
hintText: _subtitle.maintenanceIssue, hintText: _subtitle.maintenanceIssue,
prefixIconData: FontAwesomeIcons.triangleExclamation, prefixIconData: FontAwesomeIcons.triangleExclamation,
style: Theme.of(context).textTheme.headline6, style: Theme.of(context).textTheme.titleLarge,
textInputType: TextInputType.multiline, textInputType: TextInputType.multiline,
validator: (value) => Validator.hasValue(value) ? null : _subtitle.maintenanceIssueRequired, validator: (value) => Validator.hasValue(value) ? null : _subtitle.maintenanceIssueRequired,
onSaved: (value) { onSaved: (value) {
@ -286,12 +285,12 @@ class CreateRequestPageState extends State<CreateRequestPage> {
if (widget.serviceRequest != null) if (widget.serviceRequest != null)
ATextFormField( ATextFormField(
controller: _commentController, controller: _commentController,
initialValue: _serviceRequest.comment, initialValue: _serviceRequest.comments,
hintText: _subtitle.comment, hintText: _subtitle.comment,
style: Theme.of(context).textTheme.titleMedium, style: Theme.of(context).textTheme.titleMedium,
textInputType: TextInputType.multiline, textInputType: TextInputType.multiline,
onSaved: (value) { onSaved: (value) {
_serviceRequest.comment = value; _serviceRequest.comments = value;
}, },
), ),
], ],

@ -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/loaders/loading_manager.dart';
import 'package:test_sa/views/widgets/parts/auto_complete_parts_field.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/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_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_reasons.dart';
import 'package:test_sa/views/widgets/status/report/service_report_status.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/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 'package:test_sa/views/widgets/titles/app_sub_title.dart';
import '../../../../widgets/speech_to_text/speech_to_text.dart'; import '../../../../widgets/speech_to_text/speech_to_text.dart';
@ -339,13 +337,13 @@ class _CreateServiceReportState extends State<CreateServiceReport> with TickerPr
), ),
if (_showCommentField) if (_showCommentField)
ATextFormField( ATextFormField(
initialValue: _serviceReport?.comment, initialValue: _serviceReport?.reviewComment,
hintText: _subtitle.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.comment = value; _serviceReport.reviewComment = value;
}, },
), ),
SizedBox( SizedBox(

Loading…
Cancel
Save