diff --git a/lib/models/service_request/search_work_order.dart b/lib/models/service_request/search_work_order.dart index 4294f499..8483a676 100644 --- a/lib/models/service_request/search_work_order.dart +++ b/lib/models/service_request/search_work_order.dart @@ -39,6 +39,7 @@ class SearchWorkOrder { this.nurseSignature, this.woParentDto, this.timer, + this.mrNumber, }); SearchWorkOrder.fromJson(dynamic json) { @@ -51,6 +52,7 @@ class SearchWorkOrder { assetType = json['assetType'] != null ? Lookup.fromJson(json['assetType']) : null; assignedEmployee = json['assignedEmployee'] != null ? AssignedEmployee.fromJson(json['assignedEmployee']) : null; visitDate = json['visitDate']; + mrNumber = json['mrNumber']; if (json['assistantEmployees'] != null) { assistantEmployees = []; json['assistantEmployees'].forEach((v) { @@ -145,6 +147,7 @@ class SearchWorkOrder { engSignature = wo.engSignature ?? engSignature; nurseSignature = wo.nurseSignature ?? nurseSignature; woParentDto = wo.woParentDto ?? woParentDto; + mrNumber = wo.mrNumber ?? mrNumber; } num id; @@ -180,6 +183,7 @@ class SearchWorkOrder { String nurseSignature; WoParentDto woParentDto; TimerModel timer; + String mrNumber; SearchWorkOrder copyWith({ num id, @@ -215,6 +219,7 @@ class SearchWorkOrder { String nurseSignature, WoParentDto woParentDto, TimerModel timer, + String mrNumber, }) => SearchWorkOrder( id: id ?? this.id, @@ -250,6 +255,7 @@ class SearchWorkOrder { nurseSignature: nurseSignature ?? this.nurseSignature, woParentDto: woParentDto ?? this.woParentDto, timer: timer ?? this.timer, + mrNumber: mrNumber ?? this.mrNumber, ); Map toJson() { @@ -319,6 +325,9 @@ class SearchWorkOrder { if (woParentDto != null) { map['woParentDto'] = woParentDto.toJson(); } + if (mrNumber != null) { + map['mrNumber'] = mrNumber; + } return map; } diff --git a/lib/views/pages/sub_workorder/work_order_details_bottom_sheet.dart b/lib/views/pages/sub_workorder/work_order_details_bottom_sheet.dart index 13c807eb..5ed1e253 100644 --- a/lib/views/pages/sub_workorder/work_order_details_bottom_sheet.dart +++ b/lib/views/pages/sub_workorder/work_order_details_bottom_sheet.dart @@ -13,7 +13,6 @@ import 'package:test_sa/views/widgets/status/service_request/supplier_engineers_ import '../../../controllers/localization/localization.dart'; import '../../../controllers/providers/api/status_drop_down/report/service_report_maintenance_situation_provider.dart'; -import '../../app_style/colors.dart'; import '../../widgets/timer/app_timer.dart'; import '../../widgets/titles/app_sub_title.dart'; import 'auto_generated_vendor_name.dart'; @@ -144,6 +143,7 @@ class _WorkOrderDetailsBottomSheetState extends State