From 60511b60cfb2afd76c15df2cdbfeff5e5442fb87 Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Mon, 24 Nov 2025 12:18:55 +0300 Subject: [PATCH] files refactoring --- lib/main.dart | 4 ++-- ...n_request_view.dart => create_loan_request_page.dart} | 9 +++++---- .../land_page/create_request_type_bottom_sheet.dart | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) rename lib/modules/loan_module/pages/{create_loan_request_view.dart => create_loan_request_page.dart} (98%) diff --git a/lib/main.dart b/lib/main.dart index 5c988a5d..d4544472 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -37,7 +37,7 @@ import 'package:test_sa/modules/internal_audit_module/pages/system_internal_audi import 'package:test_sa/modules/internal_audit_module/provider/internal_audit_finding_type_provider.dart'; import 'package:test_sa/modules/internal_audit_module/provider/internal_audit_provider.dart'; import 'package:test_sa/modules/internal_audit_module/provider/internal_audit_wo_type_provider.dart'; -import 'package:test_sa/modules/loan_module/pages/create_loan_request_view.dart'; +import 'package:test_sa/modules/loan_module/pages/create_loan_request_page.dart'; import 'package:test_sa/modules/loan_module/provider/loan_period_provider.dart'; import 'package:test_sa/modules/loan_module/provider/loan_provider.dart'; import 'package:test_sa/modules/loan_module/provider/medical_department_provider.dart'; @@ -382,7 +382,7 @@ class MyApp extends StatelessWidget { CreateSystemInternalAuditForm.id: (_) => const CreateSystemInternalAuditForm(), UpdateEquipmentInternalAuditPage.id: (_) => UpdateEquipmentInternalAuditPage(), UpdateSystemInternalAuditPage.id: (_) => UpdateSystemInternalAuditPage(), - CreateLoanRequestView.id: (_) => CreateLoanRequestView(), + CreateLoanRequestPage.id: (_) => CreateLoanRequestPage(), // SwipeSuccessView.routeName: (_) => const SwipeSuccessView(), // SwipeHistoryView.routeName: (_) => const SwipeHistoryView(), }, diff --git a/lib/modules/loan_module/pages/create_loan_request_view.dart b/lib/modules/loan_module/pages/create_loan_request_page.dart similarity index 98% rename from lib/modules/loan_module/pages/create_loan_request_view.dart rename to lib/modules/loan_module/pages/create_loan_request_page.dart index 2fe42ac2..cea4f8ef 100644 --- a/lib/modules/loan_module/pages/create_loan_request_view.dart +++ b/lib/modules/loan_module/pages/create_loan_request_page.dart @@ -48,17 +48,17 @@ import 'package:test_sa/views/widgets/images/multi_image_picker.dart'; import '../../../../../../new_views/common_widgets/default_app_bar.dart'; import '../../../models/new_models/department.dart'; -class CreateLoanRequestView extends StatefulWidget { +class CreateLoanRequestPage extends StatefulWidget { static const String id = "/create-loan"; int? workOrderId; - CreateLoanRequestView({Key? key, this.workOrderId}) : super(key: key); + CreateLoanRequestPage({Key? key, this.workOrderId}) : super(key: key); @override - _CreateLoanRequestViewState createState() => _CreateLoanRequestViewState(); + _CreateLoanRequestPageState createState() => _CreateLoanRequestPageState(); } -class _CreateLoanRequestViewState extends State with TickerProviderStateMixin { +class _CreateLoanRequestPageState extends State with TickerProviderStateMixin { final List attachments = []; final GlobalKey _formKey = GlobalKey(); final GlobalKey _scaffoldKey = GlobalKey(); @@ -475,6 +475,7 @@ class _CreateLoanRequestViewState extends State with Tick } Future _submit() async { + FocusScope.of(context).unfocus(); if (isBackUpRequest && device == null) { "Please scan or pick asset".showToast; return; 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 36244e1a..3083fb12 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 @@ -12,7 +12,7 @@ import 'package:test_sa/models/enums/user_types.dart'; import 'package:test_sa/modules/cm_module/create_cm_request.dart'; import 'package:test_sa/modules/internal_audit_module/pages/equipment_internal_audit/create_equipment_internal_audit_form.dart'; import 'package:test_sa/modules/internal_audit_module/pages/system_internal_audit/create_system_internal_audit_form.dart'; -import 'package:test_sa/modules/loan_module/pages/create_loan_request_view.dart'; +import 'package:test_sa/modules/loan_module/pages/create_loan_request_page.dart'; import 'package:test_sa/modules/tm_module/device_transfer/create_device_transfer_request.dart'; import 'package:test_sa/modules/tm_module/tasks/create_task_view.dart'; import 'package:test_sa/modules/traf_module/create_traf_request_page.dart'; @@ -115,7 +115,7 @@ class CreateRequestModel { //TODO uncommit this to enable task. list.add(CreateRequestModel(context.translation.task, "add_icon", CreateTaskView.id)); list.add(CreateRequestModel("TRAF".addTranslation, "add_icon", CreateTRAFRequestPage.id)); - list.add(CreateRequestModel('Loan Equipment Request'.addTranslation, "add_icon", CreateLoanRequestView.id)); + list.add(CreateRequestModel('Loan Equipment Request'.addTranslation, "add_icon", CreateLoanRequestPage.id)); } return list; }