From 09762fd278d570faf74682196b94ec4f07efacbe Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Mon, 24 Nov 2025 09:37:52 +0300 Subject: [PATCH] files refactoring --- lib/main.dart | 4 ++-- lib/modules/cm_module/create_cm_request.dart | 8 ++++---- .../tm_module/gas_refill}/gas_refill_request_form.dart | 5 ++--- .../pages/land_page/create_request_type_bottom_sheet.dart | 6 +++--- 4 files changed, 11 insertions(+), 12 deletions(-) rename lib/{new_views/pages => modules/tm_module/gas_refill}/gas_refill_request_form.dart (99%) diff --git a/lib/main.dart b/lib/main.dart index 03c28344..5c988a5d 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -113,7 +113,7 @@ import 'modules/tm_module/device_transfer/create_device_transfer_request.dart'; import 'modules/tm_module/device_transfer/device_filter_screen.dart'; import 'modules/tm_module/device_transfer/device_search_screen.dart'; import 'modules/tm_module/tasks/create_task_view.dart'; -import 'new_views/pages/gas_refill_request_form.dart'; +import 'modules/tm_module/gas_refill/gas_refill_request_form.dart'; import 'providers/lookups/classification_lookup_provider.dart'; import 'providers/lookups/department_lookup_provider.dart'; import 'providers/lookups/request_type_lookup_provider.dart'; @@ -353,7 +353,7 @@ class MyApp extends StatelessWidget { CreateGasRefillRequest.id: (_) => const CreateGasRefillRequest(), UpdateGasRefillRequest.id: (_) => const UpdateGasRefillRequest(), // CreateServiceRequestPage.id: (_) => const CreateServiceRequestPage(), - CreateNewRequest.id: (_) => const CreateNewRequest(), + CreateCMRequest.id: (_) => const CreateCMRequest(), // SingleHospitalPicker.id: (_) => SingleHospitalPicker(), MyAssetsPage.id: (_) => const MyAssetsPage(), SingleDepartmentPicker.id: (_) => const SingleDepartmentPicker(), diff --git a/lib/modules/cm_module/create_cm_request.dart b/lib/modules/cm_module/create_cm_request.dart index b535be50..1ae1d862 100644 --- a/lib/modules/cm_module/create_cm_request.dart +++ b/lib/modules/cm_module/create_cm_request.dart @@ -37,17 +37,17 @@ import 'package:test_sa/views/widgets/sound/TextSpeechRecordWidget.dart'; import '../../../../new_views/common_widgets/default_app_bar.dart'; -class CreateNewRequest extends StatefulWidget { +class CreateCMRequest extends StatefulWidget { static const String id = "/create-new-request"; - const CreateNewRequest({Key? key}) : super(key: key); + const CreateCMRequest({Key? key}) : super(key: key); @override - _CreateNewRequestState createState() => _CreateNewRequestState(); + _CreateCMRequestState createState() => _CreateCMRequestState(); } //TODO remove unnecessary code -class _CreateNewRequestState extends State with TickerProviderStateMixin { +class _CreateCMRequestState extends State with TickerProviderStateMixin { late TextEditingController _commentController; late UserProvider _userProvider; late SettingProvider _settingProvider; diff --git a/lib/new_views/pages/gas_refill_request_form.dart b/lib/modules/tm_module/gas_refill/gas_refill_request_form.dart similarity index 99% rename from lib/new_views/pages/gas_refill_request_form.dart rename to lib/modules/tm_module/gas_refill/gas_refill_request_form.dart index a5ab243f..1d61deca 100644 --- a/lib/new_views/pages/gas_refill_request_form.dart +++ b/lib/modules/tm_module/gas_refill/gas_refill_request_form.dart @@ -237,9 +237,8 @@ class _GasRefillRequestFormState extends State { _gasModel.gasRefillDetails?.add(_currentDetails); _gasModel.gasRefillAttachments = []; for (var item in attachments) { - String fileName = CMRequestUtils.isLocalUrl(item.name??'') ? ("${item.name??''.split("/").last}|${base64Encode(File(item.name??'').readAsBytesSync())}") :item.name??''; - _gasModel.gasRefillAttachments?.add(GasRefillAttachments( - id: item.id, gasRefillId: _gasModel.id ?? 0, attachmentName: fileName)); + String fileName = CMRequestUtils.isLocalUrl(item.name ?? '') ? ("${item.name ?? ''.split("/").last}|${base64Encode(File(item.name ?? '').readAsBytesSync())}") : item.name ?? ''; + _gasModel.gasRefillAttachments?.add(GasRefillAttachments(id: item.id, gasRefillId: _gasModel.id ?? 0, attachmentName: fileName)); } await _gasRefillProvider?.addGasRefillRequest( context: context, diff --git a/lib/new_views/pages/land_page/create_request_type_bottom_sheet.dart b/lib/new_views/pages/land_page/create_request_type_bottom_sheet.dart index c121baf0..36244e1a 100644 --- a/lib/new_views/pages/land_page/create_request_type_bottom_sheet.dart +++ b/lib/new_views/pages/land_page/create_request_type_bottom_sheet.dart @@ -17,7 +17,7 @@ import 'package:test_sa/modules/tm_module/device_transfer/create_device_transfer import 'package:test_sa/modules/tm_module/tasks/create_task_view.dart'; import 'package:test_sa/modules/traf_module/create_traf_request_page.dart'; import 'package:test_sa/new_views/app_style/app_color.dart'; -import 'package:test_sa/new_views/pages/gas_refill_request_form.dart'; +import 'package:test_sa/modules/tm_module/gas_refill/gas_refill_request_form.dart'; class CreateRequestTypeBottomSheet extends StatelessWidget { const CreateRequestTypeBottomSheet({super.key}); @@ -104,12 +104,12 @@ class CreateRequestModel { list.add(CreateRequestModel("TRAF".addTranslation, "add_icon", CreateTRAFRequestPage.id)); } else if (context.userProvider.isEngineer) { if (Provider.of(context, listen: false).engineerCanCreateCM) { - list.add(CreateRequestModel(context.translation.correctiveMaintenance, "add_icon", CreateNewRequest.id)); + list.add(CreateRequestModel(context.translation.correctiveMaintenance, "add_icon", CreateCMRequest.id)); } //TODO uncommit this to enable task. list.add(CreateRequestModel(context.translation.task, "add_icon", CreateTaskView.id)); } else { - list.add(CreateRequestModel(context.translation.correctiveMaintenance, "add_icon", CreateNewRequest.id)); + list.add(CreateRequestModel(context.translation.correctiveMaintenance, "add_icon", CreateCMRequest.id)); list.add(CreateRequestModel(context.translation.gasRefill, "add_icon", GasRefillRequestForm.routeName)); list.add(CreateRequestModel(context.translation.transferAsset, "add_icon", CreateDeviceTransferRequest.id)); //TODO uncommit this to enable task.