From a54370005f5ceb331f720c973bfef78a7359258e Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Mon, 12 May 2025 12:03:47 +0300 Subject: [PATCH 1/3] bug 902 fixed. --- .../pages/user/tasks_request/task_request_detail_view.dart | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/views/pages/user/tasks_request/task_request_detail_view.dart b/lib/views/pages/user/tasks_request/task_request_detail_view.dart index 88606286..c526043d 100644 --- a/lib/views/pages/user/tasks_request/task_request_detail_view.dart +++ b/lib/views/pages/user/tasks_request/task_request_detail_view.dart @@ -108,6 +108,7 @@ class _TaskRequestDetailsViewState extends State { ), '${context.translation.taskType}: ${taskModel?.taskType?.typeName ?? "-"}'.bodyText(context), '${context.translation.taskNo}: ${taskModel?.taskJobNo ?? "-"}'.bodyText(context), + '${context.translation.createdBy}: ${taskModel?.userCreated?.userName ?? "-"}'.bodyText(context), if (taskProvider.taskRequestModel?.taskType?.isRecallAndAlert == true) ...[ recallAlertTypeWidget(taskModel: taskProvider.taskRequestModel!), Column( @@ -132,6 +133,10 @@ class _TaskRequestDetailsViewState extends State { if (taskProvider.taskRequestModel?.taskJobAttachments?.isNotEmpty ?? false) ...[ 8.height, const Divider().defaultStyle(context), + Text( + "Attachments".addTranslation, + style: AppTextStyles.heading4.copyWith(color: context.isDark ? AppColor.neutral30 : AppColor.neutral50), + ), FilesList(images: taskProvider.taskRequestModel!.taskJobAttachments!.map((toElement) => URLs.getFileUrl(toElement.name ?? '') ?? '').toList()), ], buildTechnicalComments(taskModel: taskModel), From 8c9a8aa3261a2a07ccc1ea06e7b4c0c90bd9b361 Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Mon, 12 May 2025 17:42:12 +0300 Subject: [PATCH 2/3] FMS- description of finding & action taken field added. --- .../workorder/work_order_helper_models.dart | 6 ++++ .../new_models/work_order_detail_model.dart | 14 +++++--- .../views/components/asset_detail_card.dart | 18 ++++++---- .../service_request_detail_view.dart | 2 ++ .../asset_retired/verify_asset_detail.dart | 36 +++++++++++++++++-- 5 files changed, 63 insertions(+), 13 deletions(-) diff --git a/lib/models/helper_data_models/workorder/work_order_helper_models.dart b/lib/models/helper_data_models/workorder/work_order_helper_models.dart index a1fcdc26..b8d691a2 100644 --- a/lib/models/helper_data_models/workorder/work_order_helper_models.dart +++ b/lib/models/helper_data_models/workorder/work_order_helper_models.dart @@ -82,6 +82,8 @@ class EngineerUpdateWorkOrderHelperModel { FaultDescription? faultDescription; String? solution; String? callResponse; + String? descriptionOfFinding; + String? actionTaken; EngineerUpdateWorkOrderHelperModel({ this.workOrderId, @@ -95,6 +97,8 @@ class EngineerUpdateWorkOrderHelperModel { this.solution, this.returnToService, this.callResponse, + this.descriptionOfFinding, + this.actionTaken, }); Map toJson() { @@ -107,6 +111,8 @@ class EngineerUpdateWorkOrderHelperModel { data['failureReasonId'] = failureReason?.id; data['faultDescriptionId'] = faultDescription?.id; data['callResponse'] = callResponse; + data['descriptionOfFinding'] = descriptionOfFinding; + data['actionTaken'] = actionTaken; return data; } } diff --git a/lib/models/new_models/work_order_detail_model.dart b/lib/models/new_models/work_order_detail_model.dart index 25f9af5c..3e2bfc55 100644 --- a/lib/models/new_models/work_order_detail_model.dart +++ b/lib/models/new_models/work_order_detail_model.dart @@ -91,6 +91,8 @@ class WorkOrderData { this.cmFrame, this.rejectComment, this.callResponse, + this.descriptionOfFinding, + this.actionTaken, required this.workOrderHistory, required this.activities, required this.activityAssetToBeRetireds, @@ -143,8 +145,10 @@ class WorkOrderData { String? iHaveArrivedDate; String? closedDate; Lookup? rejectReason; - String? rejectComment; // need to replace with reject comments. - String? callResponse; // need to replace with reject comments. + String? rejectComment; + String? callResponse; + String? descriptionOfFinding; + String? actionTaken; int? since; List workOrderHistory; List activities; @@ -168,6 +172,8 @@ class WorkOrderData { room: json["room"], rejectComment: json["rejectComment"], callResponse: json["callResponse"], + descriptionOfFinding: json["descriptionOfFinding"], + actionTaken: json["actionTaken"], iHaveArrivedDate: json["iHaveArrivedDate"], closedDate: json["closedDate"], cmFrame: json["cmFrame"] == null ? null : Lookup.fromJson(json["cmFrame"]), @@ -529,7 +535,7 @@ class WorkOrderContactPerson { String? position; String? extension; String? email; - String ?mobilePhone; + String? mobilePhone; WorkOrderAssignedEmployee? contactUser; factory WorkOrderContactPerson.fromJson(Map json) { @@ -662,7 +668,7 @@ class ActivityMaintenance { this.supplierEngineer, this.supplierStartTime, this.supplierEndTime, - this.activityType, + this.activityType, this.supplierWorkingHours, this.assistantEmployees}); diff --git a/lib/service_request_latest/views/components/asset_detail_card.dart b/lib/service_request_latest/views/components/asset_detail_card.dart index 914b847d..824573e4 100644 --- a/lib/service_request_latest/views/components/asset_detail_card.dart +++ b/lib/service_request_latest/views/components/asset_detail_card.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; +import 'package:test_sa/controllers/providers/settings/setting_provider.dart'; import 'package:test_sa/extensions/context_extension.dart'; import 'package:test_sa/extensions/int_extensions.dart'; import 'package:test_sa/extensions/string_extensions.dart'; @@ -50,12 +51,7 @@ class AssetDetailCard extends StatelessWidget { if (!requestDetailProvider.isReadOnlyRequest) "edit_icon".toSvgAsset(height: 21, width: 21).onPress(() async { requestDetailProvider.refreshTimer = false; - await Navigator.push( - context, - MaterialPageRoute( - builder: (context) => VerifyAssetDetails( - isEdit: true, - ))); + await Navigator.push(context, MaterialPageRoute(builder: (context) => VerifyAssetDetails(isEdit: true))); requestDetailProvider.refreshTimer = true; }), ]), @@ -84,6 +80,16 @@ class AssetDetailCard extends StatelessWidget { '${context.translation.solutions}: ${requestDetailProvider.engineerUpdateWorkOrderHelperModel?.solution ?? '-'}', style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral120), ), + if (Provider.of(context, listen: false).isUserFMS) ...[ + Text( + 'Description of Finding: ${requestDetailProvider.engineerUpdateWorkOrderHelperModel?.descriptionOfFinding ?? '-'}', + style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral120), + ), + Text( + 'Action Taken: ${requestDetailProvider.engineerUpdateWorkOrderHelperModel?.actionTaken ?? '-'}', + style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral120), + ), + ] ], ), ); diff --git a/lib/service_request_latest/views/components/service_request_detail_view.dart b/lib/service_request_latest/views/components/service_request_detail_view.dart index 9e7eee14..c91001d9 100644 --- a/lib/service_request_latest/views/components/service_request_detail_view.dart +++ b/lib/service_request_latest/views/components/service_request_detail_view.dart @@ -487,6 +487,8 @@ class _ServiceRequestDetailViewState extends State { solution: currentWorkOrderData.faultDescription?.workPerformed, returnToService: currentWorkOrderData.returnToService, serviceType: currentWorkOrderData.serviceType, + descriptionOfFinding: currentWorkOrderData.descriptionOfFinding, + actionTaken: currentWorkOrderData.actionTaken, ); return const AssetDetailCard(); } else { diff --git a/lib/service_request_latest/views/forms/asset_retired/verify_asset_detail.dart b/lib/service_request_latest/views/forms/asset_retired/verify_asset_detail.dart index 6952d29b..429bb05f 100644 --- a/lib/service_request_latest/views/forms/asset_retired/verify_asset_detail.dart +++ b/lib/service_request_latest/views/forms/asset_retired/verify_asset_detail.dart @@ -2,6 +2,7 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; +import 'package:test_sa/controllers/providers/settings/setting_provider.dart'; import 'package:test_sa/extensions/context_extension.dart'; import 'package:test_sa/extensions/int_extensions.dart'; import 'package:test_sa/extensions/text_extensions.dart'; @@ -27,7 +28,6 @@ import 'package:test_sa/views/widgets/equipment/pick_asset.dart'; import '../../../../../../models/lookup.dart'; import '../../../../../../new_views/common_widgets/default_app_bar.dart'; -//TODO Have some details need to confirm from backend fault description, class VerifyAssetDetails extends StatefulWidget { static const String id = "/verify-asset-detail"; bool isEdit = false; @@ -76,6 +76,8 @@ class _VerifyAssetDetailsState extends State with TickerProv returnToService: currentWorkOrderData.returnToService, serviceType: currentWorkOrderData.serviceType, callResponse: currentWorkOrderData.callResponse, + descriptionOfFinding: currentWorkOrderData.descriptionOfFinding, + actionTaken: currentWorkOrderData.actionTaken, ); if (currentWorkOrderData.assetLoan != null) { loanAvailabilityAsset = Asset( @@ -221,7 +223,7 @@ class _VerifyAssetDetailsState extends State with TickerProv context.translation.solutions.heading6(context).custom(color: AppColor.neutral50), 8.height, requestDetailProvider.engineerUpdateWorkOrderHelperModel?.solution != null - ? requestDetailProvider.engineerUpdateWorkOrderHelperModel!.solution!.bodyText2(context).custom(color: AppColor.neutral120,align: TextAlign.justify) + ? requestDetailProvider.engineerUpdateWorkOrderHelperModel!.solution!.bodyText2(context).custom(color: AppColor.neutral120, align: TextAlign.justify) : const SizedBox(), ], 8.height, @@ -232,11 +234,39 @@ class _VerifyAssetDetailsState extends State with TickerProv textAlign: TextAlign.center, labelStyle: AppTextStyles.textFieldLabelStyle, showShadow: false, - onChange: (value){ + onChange: (value) { requestDetailProvider.engineerUpdateWorkOrderHelperModel?.callResponse = value; }, style: Theme.of(context).textTheme.titleMedium, ), + if (Provider.of(context, listen: false).isUserFMS) ...[ + 8.height, + AppTextFormField( + labelText: "Description of Finding", + backgroundColor: AppColor.neutral100, + initialValue: requestDetailProvider.engineerUpdateWorkOrderHelperModel?.descriptionOfFinding, + textAlign: TextAlign.center, + labelStyle: AppTextStyles.textFieldLabelStyle, + showShadow: false, + onChange: (value) { + requestDetailProvider.engineerUpdateWorkOrderHelperModel?.descriptionOfFinding = value; + }, + style: Theme.of(context).textTheme.titleMedium, + ), + 8.height, + AppTextFormField( + labelText: "Action Taken", + backgroundColor: AppColor.neutral100, + initialValue: requestDetailProvider.engineerUpdateWorkOrderHelperModel?.actionTaken, + textAlign: TextAlign.center, + labelStyle: AppTextStyles.textFieldLabelStyle, + showShadow: false, + onChange: (value) { + requestDetailProvider.engineerUpdateWorkOrderHelperModel?.actionTaken = value; + }, + style: Theme.of(context).textTheme.titleMedium, + ), + ] ], ).toShadowContainer(context).paddingAll(16), ).expanded, From 413f6cc398b4fc1bc9442ce02fa9c4bb90bba7fe Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Mon, 12 May 2025 17:44:48 +0300 Subject: [PATCH 3/3] refactor service request to cm module --- .../service_request_detail_provider.dart | 0 .../utilities/service_request_utils.dart | 0 .../views/components/action_button/footer_action_button.dart | 0 .../views/components/activities_list_view.dart | 0 .../views/components/activity_card_view.dart | 0 .../views/components/asset_detail_card.dart | 0 .../components/bottom_sheets/service_request_bottomsheet.dart | 0 .../views/components/history_log_view.dart | 0 .../views/components/initial_visit_card.dart | 0 .../views/components/scan_qr_view.dart | 0 .../views/components/service_request_detail_view.dart | 0 .../views/components/timer_widget.dart | 0 .../views/components/verify_arrival_view.dart | 0 .../views/components/verify_otp_view.dart | 0 .../views/components/weekly_calendar_fragment.dart | 0 .../views/components/work_order_card_view.dart | 0 .../views/forms/asset_retired/asset_retired.dart | 0 .../views/forms/asset_retired/verify_asset_detail.dart | 0 .../maintenance_request/components/assistant_employee_card.dart | 0 .../forms/maintenance_request/components/external_request.dart | 0 .../forms/maintenance_request/components/internal_request.dart | 0 .../views/forms/maintenance_request/maintenance_request_main.dart | 0 .../views/forms/spare_part/spare_part_request.dart | 0 .../views/forms/work_order/components/asset_conditon_view.dart | 0 .../views/forms/work_order/components/attachments_view.dart | 0 .../views/forms/work_order/components/time_duration_view.dart | 0 .../views/forms/work_order/work_order_form_view.dart | 0 .../views/nurse/create_new_request_view.dart | 0 .../views/service_request_detail_main_view.dart | 0 29 files changed, 0 insertions(+), 0 deletions(-) rename lib/{service_request_latest => cm_module}/service_request_detail_provider.dart (100%) rename lib/{service_request_latest => cm_module}/utilities/service_request_utils.dart (100%) rename lib/{service_request_latest => cm_module}/views/components/action_button/footer_action_button.dart (100%) rename lib/{service_request_latest => cm_module}/views/components/activities_list_view.dart (100%) rename lib/{service_request_latest => cm_module}/views/components/activity_card_view.dart (100%) rename lib/{service_request_latest => cm_module}/views/components/asset_detail_card.dart (100%) rename lib/{service_request_latest => cm_module}/views/components/bottom_sheets/service_request_bottomsheet.dart (100%) rename lib/{service_request_latest => cm_module}/views/components/history_log_view.dart (100%) rename lib/{service_request_latest => cm_module}/views/components/initial_visit_card.dart (100%) rename lib/{service_request_latest => cm_module}/views/components/scan_qr_view.dart (100%) rename lib/{service_request_latest => cm_module}/views/components/service_request_detail_view.dart (100%) rename lib/{service_request_latest => cm_module}/views/components/timer_widget.dart (100%) rename lib/{service_request_latest => cm_module}/views/components/verify_arrival_view.dart (100%) rename lib/{service_request_latest => cm_module}/views/components/verify_otp_view.dart (100%) rename lib/{service_request_latest => cm_module}/views/components/weekly_calendar_fragment.dart (100%) rename lib/{service_request_latest => cm_module}/views/components/work_order_card_view.dart (100%) rename lib/{service_request_latest => cm_module}/views/forms/asset_retired/asset_retired.dart (100%) rename lib/{service_request_latest => cm_module}/views/forms/asset_retired/verify_asset_detail.dart (100%) rename lib/{service_request_latest => cm_module}/views/forms/maintenance_request/components/assistant_employee_card.dart (100%) rename lib/{service_request_latest => cm_module}/views/forms/maintenance_request/components/external_request.dart (100%) rename lib/{service_request_latest => cm_module}/views/forms/maintenance_request/components/internal_request.dart (100%) rename lib/{service_request_latest => cm_module}/views/forms/maintenance_request/maintenance_request_main.dart (100%) rename lib/{service_request_latest => cm_module}/views/forms/spare_part/spare_part_request.dart (100%) rename lib/{service_request_latest => cm_module}/views/forms/work_order/components/asset_conditon_view.dart (100%) rename lib/{service_request_latest => cm_module}/views/forms/work_order/components/attachments_view.dart (100%) rename lib/{service_request_latest => cm_module}/views/forms/work_order/components/time_duration_view.dart (100%) rename lib/{service_request_latest => cm_module}/views/forms/work_order/work_order_form_view.dart (100%) rename lib/{service_request_latest => cm_module}/views/nurse/create_new_request_view.dart (100%) rename lib/{service_request_latest => cm_module}/views/service_request_detail_main_view.dart (100%) diff --git a/lib/service_request_latest/service_request_detail_provider.dart b/lib/cm_module/service_request_detail_provider.dart similarity index 100% rename from lib/service_request_latest/service_request_detail_provider.dart rename to lib/cm_module/service_request_detail_provider.dart diff --git a/lib/service_request_latest/utilities/service_request_utils.dart b/lib/cm_module/utilities/service_request_utils.dart similarity index 100% rename from lib/service_request_latest/utilities/service_request_utils.dart rename to lib/cm_module/utilities/service_request_utils.dart diff --git a/lib/service_request_latest/views/components/action_button/footer_action_button.dart b/lib/cm_module/views/components/action_button/footer_action_button.dart similarity index 100% rename from lib/service_request_latest/views/components/action_button/footer_action_button.dart rename to lib/cm_module/views/components/action_button/footer_action_button.dart diff --git a/lib/service_request_latest/views/components/activities_list_view.dart b/lib/cm_module/views/components/activities_list_view.dart similarity index 100% rename from lib/service_request_latest/views/components/activities_list_view.dart rename to lib/cm_module/views/components/activities_list_view.dart diff --git a/lib/service_request_latest/views/components/activity_card_view.dart b/lib/cm_module/views/components/activity_card_view.dart similarity index 100% rename from lib/service_request_latest/views/components/activity_card_view.dart rename to lib/cm_module/views/components/activity_card_view.dart diff --git a/lib/service_request_latest/views/components/asset_detail_card.dart b/lib/cm_module/views/components/asset_detail_card.dart similarity index 100% rename from lib/service_request_latest/views/components/asset_detail_card.dart rename to lib/cm_module/views/components/asset_detail_card.dart diff --git a/lib/service_request_latest/views/components/bottom_sheets/service_request_bottomsheet.dart b/lib/cm_module/views/components/bottom_sheets/service_request_bottomsheet.dart similarity index 100% rename from lib/service_request_latest/views/components/bottom_sheets/service_request_bottomsheet.dart rename to lib/cm_module/views/components/bottom_sheets/service_request_bottomsheet.dart diff --git a/lib/service_request_latest/views/components/history_log_view.dart b/lib/cm_module/views/components/history_log_view.dart similarity index 100% rename from lib/service_request_latest/views/components/history_log_view.dart rename to lib/cm_module/views/components/history_log_view.dart diff --git a/lib/service_request_latest/views/components/initial_visit_card.dart b/lib/cm_module/views/components/initial_visit_card.dart similarity index 100% rename from lib/service_request_latest/views/components/initial_visit_card.dart rename to lib/cm_module/views/components/initial_visit_card.dart diff --git a/lib/service_request_latest/views/components/scan_qr_view.dart b/lib/cm_module/views/components/scan_qr_view.dart similarity index 100% rename from lib/service_request_latest/views/components/scan_qr_view.dart rename to lib/cm_module/views/components/scan_qr_view.dart diff --git a/lib/service_request_latest/views/components/service_request_detail_view.dart b/lib/cm_module/views/components/service_request_detail_view.dart similarity index 100% rename from lib/service_request_latest/views/components/service_request_detail_view.dart rename to lib/cm_module/views/components/service_request_detail_view.dart diff --git a/lib/service_request_latest/views/components/timer_widget.dart b/lib/cm_module/views/components/timer_widget.dart similarity index 100% rename from lib/service_request_latest/views/components/timer_widget.dart rename to lib/cm_module/views/components/timer_widget.dart diff --git a/lib/service_request_latest/views/components/verify_arrival_view.dart b/lib/cm_module/views/components/verify_arrival_view.dart similarity index 100% rename from lib/service_request_latest/views/components/verify_arrival_view.dart rename to lib/cm_module/views/components/verify_arrival_view.dart diff --git a/lib/service_request_latest/views/components/verify_otp_view.dart b/lib/cm_module/views/components/verify_otp_view.dart similarity index 100% rename from lib/service_request_latest/views/components/verify_otp_view.dart rename to lib/cm_module/views/components/verify_otp_view.dart diff --git a/lib/service_request_latest/views/components/weekly_calendar_fragment.dart b/lib/cm_module/views/components/weekly_calendar_fragment.dart similarity index 100% rename from lib/service_request_latest/views/components/weekly_calendar_fragment.dart rename to lib/cm_module/views/components/weekly_calendar_fragment.dart diff --git a/lib/service_request_latest/views/components/work_order_card_view.dart b/lib/cm_module/views/components/work_order_card_view.dart similarity index 100% rename from lib/service_request_latest/views/components/work_order_card_view.dart rename to lib/cm_module/views/components/work_order_card_view.dart diff --git a/lib/service_request_latest/views/forms/asset_retired/asset_retired.dart b/lib/cm_module/views/forms/asset_retired/asset_retired.dart similarity index 100% rename from lib/service_request_latest/views/forms/asset_retired/asset_retired.dart rename to lib/cm_module/views/forms/asset_retired/asset_retired.dart diff --git a/lib/service_request_latest/views/forms/asset_retired/verify_asset_detail.dart b/lib/cm_module/views/forms/asset_retired/verify_asset_detail.dart similarity index 100% rename from lib/service_request_latest/views/forms/asset_retired/verify_asset_detail.dart rename to lib/cm_module/views/forms/asset_retired/verify_asset_detail.dart diff --git a/lib/service_request_latest/views/forms/maintenance_request/components/assistant_employee_card.dart b/lib/cm_module/views/forms/maintenance_request/components/assistant_employee_card.dart similarity index 100% rename from lib/service_request_latest/views/forms/maintenance_request/components/assistant_employee_card.dart rename to lib/cm_module/views/forms/maintenance_request/components/assistant_employee_card.dart diff --git a/lib/service_request_latest/views/forms/maintenance_request/components/external_request.dart b/lib/cm_module/views/forms/maintenance_request/components/external_request.dart similarity index 100% rename from lib/service_request_latest/views/forms/maintenance_request/components/external_request.dart rename to lib/cm_module/views/forms/maintenance_request/components/external_request.dart diff --git a/lib/service_request_latest/views/forms/maintenance_request/components/internal_request.dart b/lib/cm_module/views/forms/maintenance_request/components/internal_request.dart similarity index 100% rename from lib/service_request_latest/views/forms/maintenance_request/components/internal_request.dart rename to lib/cm_module/views/forms/maintenance_request/components/internal_request.dart diff --git a/lib/service_request_latest/views/forms/maintenance_request/maintenance_request_main.dart b/lib/cm_module/views/forms/maintenance_request/maintenance_request_main.dart similarity index 100% rename from lib/service_request_latest/views/forms/maintenance_request/maintenance_request_main.dart rename to lib/cm_module/views/forms/maintenance_request/maintenance_request_main.dart diff --git a/lib/service_request_latest/views/forms/spare_part/spare_part_request.dart b/lib/cm_module/views/forms/spare_part/spare_part_request.dart similarity index 100% rename from lib/service_request_latest/views/forms/spare_part/spare_part_request.dart rename to lib/cm_module/views/forms/spare_part/spare_part_request.dart diff --git a/lib/service_request_latest/views/forms/work_order/components/asset_conditon_view.dart b/lib/cm_module/views/forms/work_order/components/asset_conditon_view.dart similarity index 100% rename from lib/service_request_latest/views/forms/work_order/components/asset_conditon_view.dart rename to lib/cm_module/views/forms/work_order/components/asset_conditon_view.dart diff --git a/lib/service_request_latest/views/forms/work_order/components/attachments_view.dart b/lib/cm_module/views/forms/work_order/components/attachments_view.dart similarity index 100% rename from lib/service_request_latest/views/forms/work_order/components/attachments_view.dart rename to lib/cm_module/views/forms/work_order/components/attachments_view.dart diff --git a/lib/service_request_latest/views/forms/work_order/components/time_duration_view.dart b/lib/cm_module/views/forms/work_order/components/time_duration_view.dart similarity index 100% rename from lib/service_request_latest/views/forms/work_order/components/time_duration_view.dart rename to lib/cm_module/views/forms/work_order/components/time_duration_view.dart diff --git a/lib/service_request_latest/views/forms/work_order/work_order_form_view.dart b/lib/cm_module/views/forms/work_order/work_order_form_view.dart similarity index 100% rename from lib/service_request_latest/views/forms/work_order/work_order_form_view.dart rename to lib/cm_module/views/forms/work_order/work_order_form_view.dart diff --git a/lib/service_request_latest/views/nurse/create_new_request_view.dart b/lib/cm_module/views/nurse/create_new_request_view.dart similarity index 100% rename from lib/service_request_latest/views/nurse/create_new_request_view.dart rename to lib/cm_module/views/nurse/create_new_request_view.dart diff --git a/lib/service_request_latest/views/service_request_detail_main_view.dart b/lib/cm_module/views/service_request_detail_main_view.dart similarity index 100% rename from lib/service_request_latest/views/service_request_detail_main_view.dart rename to lib/cm_module/views/service_request_detail_main_view.dart