From 51ef873770f7abe03ab242bc18066f3f9f393836 Mon Sep 17 00:00:00 2001 From: zaid_daoud Date: Thu, 16 Nov 2023 08:21:22 +0300 Subject: [PATCH] Reformatting code --- lib/attachment.dart | 3 + .../api_routes/http_status_manger.dart | 2 +- .../firebase_notification_manger.dart | 5 - .../providers/api/all_requests_provider.dart | 59 ++--- .../providers/api/gas_refill_provider.dart | 3 +- .../employee/assigned_to_provider.dart | 4 + .../employee/engineers_provider.dart | 4 + .../gas_cylinder_size_provider.dart | 4 + .../gas_cylinder_type_provider.dart | 4 + .../gas_refill/gas_status_provider.dart | 4 + .../gas_refill/gas_types_provider.dart | 4 + .../pentry/pentry_status_provider.dart | 4 + .../pentry/pentry_task_status_provider.dart | 4 + .../pentry/pentry_visit_status_provider.dart | 4 + .../service_report_defect_types_provider.dart | 4 + ...ice_report_fault_description_provider.dart | 4 + .../service_report_last_calls_provider.dart | 4 + ...report_maintenance_situation_provider.dart | 4 + .../service_report_priority_provider.dart | 4 + .../service_report_reasons_provider.dart | 4 + ...rvice_report_repair_location_provider.dart | 4 + .../service_report_status_provider.dart | 4 + .../report/service_report_types_provider.dart | 4 + ...e_report_visit_date_operator_provider.dart | 4 + .../report/service_types_provider.dart | 4 + ...service_request_first_action_provider.dart | 4 + ...ce_request_loan_availability_provider.dart | 4 + .../service_request_status_provider.dart | 4 + .../service_request_through_provider.dart | 4 + .../service_request_type_provider.dart | 4 + .../providers/settings/setting_provider.dart | 8 + lib/extensions/context_extension.dart | 3 +- lib/models/department.dart | 1 + lib/models/device/asset_by_id_model.dart | 2 +- lib/models/device/asset_search.dart | 3 + lib/models/device/asset_transfer.dart | 2 + .../device/asset_transfer_attachment.dart | 3 + lib/models/device/device_transfer_info.dart | 46 ++-- lib/models/device/model_definition.dart | 6 + lib/models/device/supplier.dart | 3 + .../device/technical_guidance_book.dart | 3 + lib/models/engineer.dart | 1 + lib/models/fault_description.dart | 5 +- lib/models/new_models/assigned_employee.dart | 3 + lib/models/new_models/assistant_employee.dart | 3 + lib/models/new_models/department.dart | 3 + lib/models/search_all_requests_model.dart | 1 + .../call_site_contact_person.dart | 3 + .../contact_person_work_order.dart | 3 + .../service_request/search_work_order.dart | 1 + .../service_request/service_report.dart | 3 + lib/models/service_request/spare_parts.dart | 6 + .../supp_engineer_work_orders.dart | 3 + .../service_request/supplier_details.dart | 21 ++ .../service_request/wo_call_request.dart | 3 + lib/models/service_request/wo_parent.dart | 6 + lib/models/system_notification_model.dart | 2 - lib/models/user.dart | 3 + lib/new_views/app_style/app_color.dart | 1 + lib/new_views/app_style/app_text_style.dart | 2 + lib/new_views/app_style/app_themes.dart | 1 + lib/new_views/common_widgets/app_drawer.dart | 11 +- .../common_widgets/app_loading_manager.dart | 1 - .../common_widgets/app_search_field.dart | 30 +-- lib/new_views/common_widgets/app_tab_bar.dart | 23 +- lib/new_views/pages/help_center_page.dart | 1 + .../pages/land_page/calendar_page.dart | 6 +- .../calender_fragments/calendar_header.dart | 5 +- .../calender_days_card.dart | 1 + .../calender_fragments/monthly_fragment.dart | 10 +- .../calender_fragments/weekly_fragment.dart | 10 +- .../progress_fragment.dart | 6 - .../requests_fragment.dart | 4 +- .../pages/land_page/home_app_bar.dart | 1 + .../my_request/all_requests_filter_page.dart | 8 +- .../my_request/all_requests_search_page.dart | 1 + .../my_request/my_requests_page.dart | 2 +- .../land_page/requests/asset_item_view.dart | 11 +- .../land_page/requests/ppm_item_view.dart | 10 +- .../requests/service_request_item_view.dart | 10 +- lib/new_views/pages/login_page.dart | 1 - lib/new_views/pages/report_bug_page.dart | 1 + lib/new_views/pages/settings_page.dart | 1 + lib/new_views/pages/splash_page.dart | 5 +- .../device_transfer/asset_filter_screen.dart | 20 +- .../device_transfer/asset_search_screen.dart | 1 + .../track_device_transfer.dart | 3 - lib/views/pages/login.dart | 2 - lib/views/pages/register.dart | 2 - lib/views/pages/splash_screen.dart | 5 +- .../auto_generated_vendor_name.dart | 1 + .../create_sub_workorder_page.dart | 231 +++++------------- .../pages/sub_workorder/workorder_list.dart | 4 - .../pages/sub_workorder/workorder_update.dart | 3 - .../user/gas_refill/gas_refill_details.dart | 2 +- .../user/gas_refill/request_gas_refill.dart | 10 +- .../user/gas_refill/track_gas_refill.dart | 2 - lib/views/pages/user/land_page.dart | 13 +- lib/views/pages/user/profile_page.dart | 13 +- lib/views/pages/user/report_issues_page.dart | 2 - .../requests/first_action_bottom_sheet.dart | 2 + .../future_request_service_details.dart | 2 - .../pages/user/requests/requests_page.dart | 9 - .../requests/update_service_request_page.dart | 1 + .../work_order/create_service_report.dart | 10 +- .../work_order/edit_service_report.dart | 4 +- .../work_order/work_order_details_page.dart | 1 + .../pages/user/visits/pantry/edit_pentry.dart | 4 +- .../visits/pantry/future_edit_pently.dart | 1 + .../preventive_maintenance_visits_page.dart | 2 - .../visits/update_visits_group_sheet.dart | 4 - .../date_and_time/from_to_date_bar.dart | 3 - .../widgets/date_and_time/time_picker.dart | 11 +- .../departments/department_button.dart | 3 - .../departments/single_department_picker.dart | 2 - .../device_transfer_info_section.dart | 1 + .../device_trancfer/device_transfer_item.dart | 8 +- .../device_trancfer/device_transfer_list.dart | 4 +- lib/views/widgets/dialogs/dialog.dart | 2 +- .../widgets/equipment/asset_detail_page.dart | 24 +- .../equipment/asset_item_gridview.dart | 8 +- .../equipment/equipment_status_buttons.dart | 2 +- .../equipment/single_device_picker.dart | 2 +- .../widgets/gas_refill/gas_refill_list.dart | 14 +- .../hospital_auto_complete_field.dart | 4 +- .../hospital_auto_complete_field_new.dart | 4 +- .../widgets/hospitals/hospital_button.dart | 2 - .../hospitals/single_hospital_picker.dart | 2 - lib/views/widgets/images/files_list.dart | 3 - .../widgets/images/mini_one_file_picker.dart | 6 +- .../widgets/images/one_image_picker.dart | 3 - .../widgets/land_page/land_page_item.dart | 6 +- lib/views/widgets/loaders/image_loader.dart | 1 + .../widgets/loaders/loading_manager.dart | 2 - lib/views/widgets/loaders/no_item_found.dart | 2 - .../notifications/notification_item.dart | 13 +- .../pentry/pentry_calibration_tool_form.dart | 1 + .../widgets/pentry/pentry_pm_kit_form.dart | 1 + .../pentry/pentry_ppm_check_list_form.dart | 1 + .../widgets/requests/request_status.dart | 3 +- .../requests/service_request_list.dart | 2 - .../search/asset_transfer_search_dialog.dart | 4 +- .../search/service_request_search_bar.dart | 1 + .../widgets/search/visits_search_bar.dart | 4 +- lib/views/widgets/status/asset_status.dart | 1 - .../status/employee/assigned_to_mune.dart | 1 + .../status/employee/engineers_mune.dart | 1 + .../status/gas_refill/gas_cylinder_size.dart | 1 + .../status/gas_refill/gas_cylinder_type.dart | 1 + .../widgets/status/gas_refill/gas_status.dart | 1 + .../widgets/status/gas_refill/gas_type.dart | 1 + .../status/pentry/pentry_status_mune.dart | 1 + .../pentry/pentry_task_status_mune.dart | 1 + .../pentry/pentry_visit_status_mune.dart | 1 + .../report/service_report_all_users.dart | 2 + ...ervice_report_assistant_employee_menu.dart | 2 + .../service_report_equipment_status.dart | 1 + .../service_report_fault_description.dart | 12 +- .../service_report_maintenance_situation.dart | 1 + .../service_report_repair_location.dart | 2 +- .../status/report/service_report_status.dart | 1 + .../status/report/service_report_type.dart | 1 + .../service_report_visit_date_operator.dart | 1 + .../service_request_first_action.dart | 1 + .../service_request_loan_availability.dart | 1 + .../service_request_priority_mune.dart | 1 + .../service_request_status_mune.dart | 1 + .../service_request_through_mune.dart | 1 + .../service_request_types_mune.dart | 1 + 169 files changed, 529 insertions(+), 498 deletions(-) diff --git a/lib/attachment.dart b/lib/attachment.dart index a89ae4a5..ce9f97d3 100644 --- a/lib/attachment.dart +++ b/lib/attachment.dart @@ -8,8 +8,10 @@ class Attachment { id = json['id']; name = json['name']; } + num id; String name; + Attachment copyWith({ num id, String name, @@ -18,6 +20,7 @@ class Attachment { id: id ?? this.id, name: name ?? this.name, ); + Map toJson() { final map = {}; map['id'] = id; diff --git a/lib/controllers/api_routes/http_status_manger.dart b/lib/controllers/api_routes/http_status_manger.dart index a6b34094..4aa0991e 100644 --- a/lib/controllers/api_routes/http_status_manger.dart +++ b/lib/controllers/api_routes/http_status_manger.dart @@ -1,5 +1,5 @@ -import 'package:meta/meta.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; +import 'package:meta/meta.dart'; class HttpStatusManger { static String getStatusMessage({ diff --git a/lib/controllers/notification/firebase_notification_manger.dart b/lib/controllers/notification/firebase_notification_manger.dart index c9d60917..c82dc586 100644 --- a/lib/controllers/notification/firebase_notification_manger.dart +++ b/lib/controllers/notification/firebase_notification_manger.dart @@ -1,11 +1,6 @@ -import 'dart:convert'; - import 'package:firebase_core/firebase_core.dart'; import 'package:firebase_messaging/firebase_messaging.dart'; import 'package:flutter/material.dart'; -import 'package:test_sa/models/system_notification_model.dart'; - -import 'notification_manger.dart'; class FirebaseNotificationManger { static FirebaseMessaging messaging = FirebaseMessaging.instance; diff --git a/lib/controllers/providers/api/all_requests_provider.dart b/lib/controllers/providers/api/all_requests_provider.dart index 71fe7e87..a3a4f3cc 100644 --- a/lib/controllers/providers/api/all_requests_provider.dart +++ b/lib/controllers/providers/api/all_requests_provider.dart @@ -35,6 +35,7 @@ class AllRequestsProvider extends ChangeNotifier { getInProgressRequests(); getCompletedRequests(); } + Future getAllRequests(BuildContext context, {int typeTransaction, SearchAllRequestsModel search}) async { if (isAllLoading == true) return -2; isAllLoading = true; @@ -261,33 +262,33 @@ class AllRequestsProvider extends ChangeNotifier { } } - // Future getCloseRequests() async { - // if (isCloseLoading == true) return -2; - // isCloseLoading = true; - // if (closeRequests == null) notifyListeners(); - // Response response; - // try { - // Map body = { - // "typeTransaction": [1, 2, 3, 4], - // "statusTransaction": [4], - // "priority": [], - // "displayData": [] - // }; - // response = await ApiManager.instance.post(URLs.getAllRequestsAndCount, body: body); - // - // stateCode = response.statusCode; - // if (response.statusCode >= 200 && response.statusCode < 300) { - // closeRequests = AllRequestsAndCount.fromJson(json.decode(response.body)["data"]); - // notifyListeners(); - // } - // isCloseLoading = false; - // notifyListeners(); - // return response.statusCode; - // } catch (error) { - // isCloseLoading = false; - // stateCode = -1; - // notifyListeners(); - // return -1; - // } - // } +// Future getCloseRequests() async { +// if (isCloseLoading == true) return -2; +// isCloseLoading = true; +// if (closeRequests == null) notifyListeners(); +// Response response; +// try { +// Map body = { +// "typeTransaction": [1, 2, 3, 4], +// "statusTransaction": [4], +// "priority": [], +// "displayData": [] +// }; +// response = await ApiManager.instance.post(URLs.getAllRequestsAndCount, body: body); +// +// stateCode = response.statusCode; +// if (response.statusCode >= 200 && response.statusCode < 300) { +// closeRequests = AllRequestsAndCount.fromJson(json.decode(response.body)["data"]); +// notifyListeners(); +// } +// isCloseLoading = false; +// notifyListeners(); +// return response.statusCode; +// } catch (error) { +// isCloseLoading = false; +// stateCode = -1; +// notifyListeners(); +// return -1; +// } +// } } diff --git a/lib/controllers/providers/api/gas_refill_provider.dart b/lib/controllers/providers/api/gas_refill_provider.dart index a2f02650..c048fd35 100644 --- a/lib/controllers/providers/api/gas_refill_provider.dart +++ b/lib/controllers/providers/api/gas_refill_provider.dart @@ -9,7 +9,6 @@ import 'package:test_sa/controllers/api_routes/urls.dart'; import 'package:test_sa/extensions/context_extension.dart'; import 'package:test_sa/models/hospital.dart'; import 'package:test_sa/models/new_models/gas_refill_model.dart'; -import 'package:test_sa/models/timer_model.dart'; import 'package:test_sa/models/user.dart'; import '../../../new_views/common_widgets/app_lazy_loading.dart'; @@ -198,5 +197,5 @@ class GasRefillProvider extends ChangeNotifier { Floors floor; Departments department; DateTime expectedDateTime; - //TimerModel timer; +//TimerModel timer; } diff --git a/lib/controllers/providers/api/status_drop_down/employee/assigned_to_provider.dart b/lib/controllers/providers/api/status_drop_down/employee/assigned_to_provider.dart index f98e16cd..a094fb02 100644 --- a/lib/controllers/providers/api/status_drop_down/employee/assigned_to_provider.dart +++ b/lib/controllers/providers/api/status_drop_down/employee/assigned_to_provider.dart @@ -19,18 +19,22 @@ class AssignedToProvider extends ChangeNotifier { // like 400 customer request failed // 500 service not available int _stateCode; + int get stateCode => _stateCode; // contain user data // when user not login or register _user = null List _items; + List get items => _items; // when categories in-process _loading = true // done _loading = true // failed _loading = false bool _loading; + bool get isLoading => _loading; + set isLoading(bool isLoading) { _loading = isLoading; notifyListeners(); diff --git a/lib/controllers/providers/api/status_drop_down/employee/engineers_provider.dart b/lib/controllers/providers/api/status_drop_down/employee/engineers_provider.dart index c075faa5..136a5f5f 100644 --- a/lib/controllers/providers/api/status_drop_down/employee/engineers_provider.dart +++ b/lib/controllers/providers/api/status_drop_down/employee/engineers_provider.dart @@ -19,18 +19,22 @@ class EngineersProvider extends ChangeNotifier { // like 400 customer request failed // 500 service not available int _stateCode; + int get stateCode => _stateCode; // contain user data // when user not login or register _user = null List _items; + List get items => _items; // when categories in-process _loading = true // done _loading = true // failed _loading = false bool _loading; + bool get isLoading => _loading; + set isLoading(bool isLoading) { _loading = isLoading; notifyListeners(); diff --git a/lib/controllers/providers/api/status_drop_down/gas_refill/gas_cylinder_size_provider.dart b/lib/controllers/providers/api/status_drop_down/gas_refill/gas_cylinder_size_provider.dart index 9ae44e96..2ceeacd6 100644 --- a/lib/controllers/providers/api/status_drop_down/gas_refill/gas_cylinder_size_provider.dart +++ b/lib/controllers/providers/api/status_drop_down/gas_refill/gas_cylinder_size_provider.dart @@ -20,18 +20,22 @@ class GasCylinderSizesProvider extends ChangeNotifier { // like 400 customer request failed // 500 service not available int _stateCode; + int get stateCode => _stateCode; // contain user data // when user not login or register _user = null List _items; + List get items => _items; // when categories in-process _loading = true // done _loading = true // failed _loading = false bool _loading; + bool get isLoading => _loading; + set isLoading(bool isLoading) { _loading = isLoading; notifyListeners(); diff --git a/lib/controllers/providers/api/status_drop_down/gas_refill/gas_cylinder_type_provider.dart b/lib/controllers/providers/api/status_drop_down/gas_refill/gas_cylinder_type_provider.dart index 52e210c8..810164a9 100644 --- a/lib/controllers/providers/api/status_drop_down/gas_refill/gas_cylinder_type_provider.dart +++ b/lib/controllers/providers/api/status_drop_down/gas_refill/gas_cylinder_type_provider.dart @@ -20,18 +20,22 @@ class GasCylinderTypesProvider extends ChangeNotifier { // like 400 customer request failed // 500 service not available int _stateCode; + int get stateCode => _stateCode; // contain user data // when user not login or register _user = null List _items; + List get items => _items; // when categories in-process _loading = true // done _loading = true // failed _loading = false bool _loading; + bool get isLoading => _loading; + set isLoading(bool isLoading) { _loading = isLoading; notifyListeners(); diff --git a/lib/controllers/providers/api/status_drop_down/gas_refill/gas_status_provider.dart b/lib/controllers/providers/api/status_drop_down/gas_refill/gas_status_provider.dart index 7dc22e8d..62da61f0 100644 --- a/lib/controllers/providers/api/status_drop_down/gas_refill/gas_status_provider.dart +++ b/lib/controllers/providers/api/status_drop_down/gas_refill/gas_status_provider.dart @@ -20,18 +20,22 @@ class GasStatusProvider extends ChangeNotifier { // like 400 customer request failed // 500 service not available int _stateCode; + int get stateCode => _stateCode; // contain user data // when user not login or register _user = null List _items; + List get items => _items; // when categories in-process _loading = true // done _loading = true // failed _loading = false bool _loading; + bool get isLoading => _loading; + set isLoading(bool isLoading) { _loading = isLoading; notifyListeners(); diff --git a/lib/controllers/providers/api/status_drop_down/gas_refill/gas_types_provider.dart b/lib/controllers/providers/api/status_drop_down/gas_refill/gas_types_provider.dart index 0050c4f5..f17d980c 100644 --- a/lib/controllers/providers/api/status_drop_down/gas_refill/gas_types_provider.dart +++ b/lib/controllers/providers/api/status_drop_down/gas_refill/gas_types_provider.dart @@ -20,18 +20,22 @@ class GasTypesProvider extends ChangeNotifier { // like 400 customer request failed // 500 service not available int _stateCode; + int get stateCode => _stateCode; // contain user data // when user not login or register _user = null List _items; + List get items => _items; // when categories in-process _loading = true // done _loading = true // failed _loading = false bool _loading; + bool get isLoading => _loading; + set isLoading(bool isLoading) { _loading = isLoading; notifyListeners(); diff --git a/lib/controllers/providers/api/status_drop_down/pentry/pentry_status_provider.dart b/lib/controllers/providers/api/status_drop_down/pentry/pentry_status_provider.dart index 26afccf5..7702296e 100644 --- a/lib/controllers/providers/api/status_drop_down/pentry/pentry_status_provider.dart +++ b/lib/controllers/providers/api/status_drop_down/pentry/pentry_status_provider.dart @@ -19,18 +19,22 @@ class PentryStatusProvider extends ChangeNotifier { // like 400 customer request failed // 500 service not available int _stateCode; + int get stateCode => _stateCode; // contain user data // when user not login or register _user = null List _items; + List get items => _items; // when categories in-process _loading = true // done _loading = true // failed _loading = false bool _loading; + bool get isLoading => _loading; + set isLoading(bool isLoading) { _loading = isLoading; notifyListeners(); diff --git a/lib/controllers/providers/api/status_drop_down/pentry/pentry_task_status_provider.dart b/lib/controllers/providers/api/status_drop_down/pentry/pentry_task_status_provider.dart index b69c310a..7107395b 100644 --- a/lib/controllers/providers/api/status_drop_down/pentry/pentry_task_status_provider.dart +++ b/lib/controllers/providers/api/status_drop_down/pentry/pentry_task_status_provider.dart @@ -19,18 +19,22 @@ class PentryTaskStatusProvider extends ChangeNotifier { // like 400 customer request failed // 500 service not available int _stateCode; + int get stateCode => _stateCode; // contain user data // when user not login or register _user = null List _items; + List get items => _items; // when categories in-process _loading = true // done _loading = true // failed _loading = false bool _loading; + bool get isLoading => _loading; + set isLoading(bool isLoading) { _loading = isLoading; notifyListeners(); diff --git a/lib/controllers/providers/api/status_drop_down/pentry/pentry_visit_status_provider.dart b/lib/controllers/providers/api/status_drop_down/pentry/pentry_visit_status_provider.dart index ab0f7d7c..944b6718 100644 --- a/lib/controllers/providers/api/status_drop_down/pentry/pentry_visit_status_provider.dart +++ b/lib/controllers/providers/api/status_drop_down/pentry/pentry_visit_status_provider.dart @@ -19,18 +19,22 @@ class PentryVisitStatusProvider extends ChangeNotifier { // like 400 customer request failed // 500 service not available int _stateCode; + int get stateCode => _stateCode; // contain user data // when user not login or register _user = null List _items; + List get items => _items; // when categories in-process _loading = true // done _loading = true // failed _loading = false bool _loading; + bool get isLoading => _loading; + set isLoading(bool isLoading) { _loading = isLoading; notifyListeners(); diff --git a/lib/controllers/providers/api/status_drop_down/report/service_report_defect_types_provider.dart b/lib/controllers/providers/api/status_drop_down/report/service_report_defect_types_provider.dart index 2c348e02..9b28cb51 100644 --- a/lib/controllers/providers/api/status_drop_down/report/service_report_defect_types_provider.dart +++ b/lib/controllers/providers/api/status_drop_down/report/service_report_defect_types_provider.dart @@ -19,18 +19,22 @@ class ServiceRequestDefectTypesProvider extends ChangeNotifier { // like 400 customer request failed // 500 service not available int _stateCode; + int get stateCode => _stateCode; // contain user data // when user not login or register _user = null List _items; + List get items => _items; // when categories in-process _loading = true // done _loading = true // failed _loading = false bool _loading; + bool get isLoading => _loading; + set isLoading(bool isLoading) { _loading = isLoading; notifyListeners(); diff --git a/lib/controllers/providers/api/status_drop_down/report/service_report_fault_description_provider.dart b/lib/controllers/providers/api/status_drop_down/report/service_report_fault_description_provider.dart index 57713c19..6c892cf2 100644 --- a/lib/controllers/providers/api/status_drop_down/report/service_report_fault_description_provider.dart +++ b/lib/controllers/providers/api/status_drop_down/report/service_report_fault_description_provider.dart @@ -21,18 +21,22 @@ class ServiceRequestFaultDescriptionProvider extends ChangeNotifier { // like 400 customer request failed // 500 service not available int _stateCode; + int get stateCode => _stateCode; // contain user data // when user not login or register _user = null List _items; + List get items => _items; // when categories in-process _loading = true // done _loading = true // failed _loading = false bool _loading; + bool get isLoading => _loading; + set isLoading(bool isLoading) { _loading = isLoading; notifyListeners(); diff --git a/lib/controllers/providers/api/status_drop_down/report/service_report_last_calls_provider.dart b/lib/controllers/providers/api/status_drop_down/report/service_report_last_calls_provider.dart index 8785cbea..c8377fee 100644 --- a/lib/controllers/providers/api/status_drop_down/report/service_report_last_calls_provider.dart +++ b/lib/controllers/providers/api/status_drop_down/report/service_report_last_calls_provider.dart @@ -19,18 +19,22 @@ class ServiceReportLastCallsProvider extends ChangeNotifier { // like 400 customer request failed // 500 service not available int _stateCode; + int get stateCode => _stateCode; // contain user data // when user not login or register _user = null List _calls; + List get calls => _calls; // when categories in-process _loading = true // done _loading = true // failed _loading = false bool _loading; + bool get isLoading => _loading; + set isLoading(bool isLoading) { _loading = isLoading; notifyListeners(); diff --git a/lib/controllers/providers/api/status_drop_down/report/service_report_maintenance_situation_provider.dart b/lib/controllers/providers/api/status_drop_down/report/service_report_maintenance_situation_provider.dart index 18720589..ca7f6603 100644 --- a/lib/controllers/providers/api/status_drop_down/report/service_report_maintenance_situation_provider.dart +++ b/lib/controllers/providers/api/status_drop_down/report/service_report_maintenance_situation_provider.dart @@ -19,18 +19,22 @@ class ServiceReportMaintenanceSituationProvider extends ChangeNotifier { // like 400 customer request failed // 500 service not available int _stateCode; + int get stateCode => _stateCode; // contain user data // when user not login or register _user = null List _calls; + List get operators => _calls; // when categories in-process _loading = true // done _loading = true // failed _loading = false bool _loading; + bool get isLoading => _loading; + set isLoading(bool isLoading) { _loading = isLoading; notifyListeners(); diff --git a/lib/controllers/providers/api/status_drop_down/report/service_report_priority_provider.dart b/lib/controllers/providers/api/status_drop_down/report/service_report_priority_provider.dart index 0bcbf913..f2211fb8 100644 --- a/lib/controllers/providers/api/status_drop_down/report/service_report_priority_provider.dart +++ b/lib/controllers/providers/api/status_drop_down/report/service_report_priority_provider.dart @@ -20,18 +20,22 @@ class ServiceRequestPriorityProvider extends ChangeNotifier { // like 400 customer request failed // 500 service not available int _stateCode; + int get stateCode => _stateCode; // contain user data // when user not login or register _user = null List _items; + List get items => _items; // when categories in-process _loading = true // done _loading = true // failed _loading = false bool _loading; + bool get isLoading => _loading; + set isLoading(bool isLoading) { _loading = isLoading; notifyListeners(); diff --git a/lib/controllers/providers/api/status_drop_down/report/service_report_reasons_provider.dart b/lib/controllers/providers/api/status_drop_down/report/service_report_reasons_provider.dart index e2f686c9..8884ca3e 100644 --- a/lib/controllers/providers/api/status_drop_down/report/service_report_reasons_provider.dart +++ b/lib/controllers/providers/api/status_drop_down/report/service_report_reasons_provider.dart @@ -19,18 +19,22 @@ class ServiceReportReasonsProvider extends ChangeNotifier { // like 400 customer request failed // 500 service not available int _stateCode; + int get stateCode => _stateCode; // contain user data // when user not login or register _user = null List _reasons; + List get reasons => _reasons; // when categories in-process _loading = true // done _loading = true // failed _loading = false bool _loading; + bool get isLoading => _loading; + set isLoading(bool isLoading) { _loading = isLoading; notifyListeners(); diff --git a/lib/controllers/providers/api/status_drop_down/report/service_report_repair_location_provider.dart b/lib/controllers/providers/api/status_drop_down/report/service_report_repair_location_provider.dart index c357a121..f9b38f3c 100644 --- a/lib/controllers/providers/api/status_drop_down/report/service_report_repair_location_provider.dart +++ b/lib/controllers/providers/api/status_drop_down/report/service_report_repair_location_provider.dart @@ -19,18 +19,22 @@ class ServiceReportRepairLocationProvider extends ChangeNotifier { // like 400 customer request failed // 500 service not available int _stateCode; + int get stateCode => _stateCode; // contain user data // when user not login or register _user = null List _reasons; + List get reasons => _reasons; // when categories in-process _loading = true // done _loading = true // failed _loading = false bool _loading; + bool get isLoading => _loading; + set isLoading(bool isLoading) { _loading = isLoading; notifyListeners(); diff --git a/lib/controllers/providers/api/status_drop_down/report/service_report_status_provider.dart b/lib/controllers/providers/api/status_drop_down/report/service_report_status_provider.dart index af3c9f86..8e245807 100644 --- a/lib/controllers/providers/api/status_drop_down/report/service_report_status_provider.dart +++ b/lib/controllers/providers/api/status_drop_down/report/service_report_status_provider.dart @@ -19,18 +19,22 @@ class ServiceReportStatusProvider extends ChangeNotifier { // like 400 customer request failed // 500 service not available int _stateCode; + int get stateCode => _stateCode; // contain user data // when user not login or register _user = null List _status; + List get statuses => _status; // when categories in-process _loading = true // done _loading = true // failed _loading = false bool _loading; + bool get isLoading => _loading; + set isLoading(bool isLoading) { _loading = isLoading; notifyListeners(); diff --git a/lib/controllers/providers/api/status_drop_down/report/service_report_types_provider.dart b/lib/controllers/providers/api/status_drop_down/report/service_report_types_provider.dart index ced86e89..96d523d8 100644 --- a/lib/controllers/providers/api/status_drop_down/report/service_report_types_provider.dart +++ b/lib/controllers/providers/api/status_drop_down/report/service_report_types_provider.dart @@ -19,18 +19,22 @@ class ServiceReportTypesProvider extends ChangeNotifier { // like 400 customer request failed // 500 service not available int _stateCode; + int get stateCode => _stateCode; // contain user data // when user not login or register _user = null List _types; + List get types => _types; // when categories in-process _loading = true // done _loading = true // failed _loading = false bool _loading; + bool get isLoading => _loading; + set isLoading(bool isLoading) { _loading = isLoading; notifyListeners(); diff --git a/lib/controllers/providers/api/status_drop_down/report/service_report_visit_date_operator_provider.dart b/lib/controllers/providers/api/status_drop_down/report/service_report_visit_date_operator_provider.dart index dc8d7855..8ea6d5c3 100644 --- a/lib/controllers/providers/api/status_drop_down/report/service_report_visit_date_operator_provider.dart +++ b/lib/controllers/providers/api/status_drop_down/report/service_report_visit_date_operator_provider.dart @@ -19,18 +19,22 @@ class ServiceReportVisitOperatorProvider extends ChangeNotifier { // like 400 customer request failed // 500 service not available int _stateCode; + int get stateCode => _stateCode; // contain user data // when user not login or register _user = null List _calls; + List get operators => _calls; // when categories in-process _loading = true // done _loading = true // failed _loading = false bool _loading; + bool get isLoading => _loading; + set isLoading(bool isLoading) { _loading = isLoading; notifyListeners(); diff --git a/lib/controllers/providers/api/status_drop_down/report/service_types_provider.dart b/lib/controllers/providers/api/status_drop_down/report/service_types_provider.dart index c28e425e..0a1d671b 100644 --- a/lib/controllers/providers/api/status_drop_down/report/service_types_provider.dart +++ b/lib/controllers/providers/api/status_drop_down/report/service_types_provider.dart @@ -19,18 +19,22 @@ class ServiceStatusProvider extends ChangeNotifier { // like 400 customer request failed // 500 service not available int _stateCode; + int get stateCode => _stateCode; // contain user data // when user not login or register _user = null List _statuses; + List get statuses => _statuses; // when categories in-process _loading = true // done _loading = true // failed _loading = false bool _loading; + bool get isLoading => _loading; + set isLoading(bool isLoading) { _loading = isLoading; notifyListeners(); diff --git a/lib/controllers/providers/api/status_drop_down/service_reqest/service_request_first_action_provider.dart b/lib/controllers/providers/api/status_drop_down/service_reqest/service_request_first_action_provider.dart index 6c1beb9d..29886958 100644 --- a/lib/controllers/providers/api/status_drop_down/service_reqest/service_request_first_action_provider.dart +++ b/lib/controllers/providers/api/status_drop_down/service_reqest/service_request_first_action_provider.dart @@ -19,18 +19,22 @@ class ServiceFirstActionProvider extends ChangeNotifier { // like 400 customer request failed // 500 service not available int _stateCode; + int get stateCode => _stateCode; // contain user data // when user not login or register _user = null List _statuses; + List get items => _statuses; // when categories in-process _loading = true // done _loading = true // failed _loading = false bool _loading; + bool get isLoading => _loading; + set isLoading(bool isLoading) { _loading = isLoading; notifyListeners(); diff --git a/lib/controllers/providers/api/status_drop_down/service_reqest/service_request_loan_availability_provider.dart b/lib/controllers/providers/api/status_drop_down/service_reqest/service_request_loan_availability_provider.dart index a4f1594a..0f07f0be 100644 --- a/lib/controllers/providers/api/status_drop_down/service_reqest/service_request_loan_availability_provider.dart +++ b/lib/controllers/providers/api/status_drop_down/service_reqest/service_request_loan_availability_provider.dart @@ -19,18 +19,22 @@ class ServiceLoanAvailabilityProvider extends ChangeNotifier { // like 400 customer request failed // 500 service not available int _stateCode; + int get stateCode => _stateCode; // contain user data // when user not login or register _user = null List _statuses; + List get items => _statuses; // when categories in-process _loading = true // done _loading = true // failed _loading = false bool _loading; + bool get isLoading => _loading; + set isLoading(bool isLoading) { _loading = isLoading; notifyListeners(); diff --git a/lib/controllers/providers/api/status_drop_down/service_reqest/service_request_status_provider.dart b/lib/controllers/providers/api/status_drop_down/service_reqest/service_request_status_provider.dart index 27de1513..4e63ceff 100644 --- a/lib/controllers/providers/api/status_drop_down/service_reqest/service_request_status_provider.dart +++ b/lib/controllers/providers/api/status_drop_down/service_reqest/service_request_status_provider.dart @@ -19,18 +19,22 @@ class ServiceRequestStatusProvider extends ChangeNotifier { // like 400 customer request failed // 500 service not available int _stateCode; + int get stateCode => _stateCode; // contain user data // when user not login or register _user = null List _statuses; + List get items => _statuses; // when categories in-process _loading = true // done _loading = true // failed _loading = false bool _loading; + bool get isLoading => _loading; + set isLoading(bool isLoading) { _loading = isLoading; notifyListeners(); diff --git a/lib/controllers/providers/api/status_drop_down/service_reqest/service_request_through_provider.dart b/lib/controllers/providers/api/status_drop_down/service_reqest/service_request_through_provider.dart index 64106b31..fb8c8386 100644 --- a/lib/controllers/providers/api/status_drop_down/service_reqest/service_request_through_provider.dart +++ b/lib/controllers/providers/api/status_drop_down/service_reqest/service_request_through_provider.dart @@ -19,18 +19,22 @@ class ServiceRequestedThroughProvider extends ChangeNotifier { // like 400 customer request failed // 500 service not available int _stateCode; + int get stateCode => _stateCode; // contain user data // when user not login or register _user = null List _statuses; + List get items => _statuses; // when categories in-process _loading = true // done _loading = true // failed _loading = false bool _loading; + bool get isLoading => _loading; + set isLoading(bool isLoading) { _loading = isLoading; notifyListeners(); diff --git a/lib/controllers/providers/api/status_drop_down/service_reqest/service_request_type_provider.dart b/lib/controllers/providers/api/status_drop_down/service_reqest/service_request_type_provider.dart index e38d3e78..d82d69ae 100644 --- a/lib/controllers/providers/api/status_drop_down/service_reqest/service_request_type_provider.dart +++ b/lib/controllers/providers/api/status_drop_down/service_reqest/service_request_type_provider.dart @@ -19,18 +19,22 @@ class ServiceRequestTypeProvider extends ChangeNotifier { // like 400 customer request failed // 500 service not available int _stateCode; + int get stateCode => _stateCode; // contain user data // when user not login or register _user = null List _statuses; + List get items => _statuses; // when categories in-process _loading = true // done _loading = true // failed _loading = false bool _loading; + bool get isLoading => _loading; + set isLoading(bool isLoading) { _loading = isLoading; notifyListeners(); diff --git a/lib/controllers/providers/settings/setting_provider.dart b/lib/controllers/providers/settings/setting_provider.dart index d77ffc9c..0a716878 100644 --- a/lib/controllers/providers/settings/setting_provider.dart +++ b/lib/controllers/providers/settings/setting_provider.dart @@ -30,7 +30,9 @@ class SettingProvider extends ChangeNotifier { } String _host; + String get host => _host; + Future setHost(String host) async { SharedPreferences prefs = await SharedPreferences.getInstance(); prefs.setString(ASettings.host, host); @@ -39,7 +41,9 @@ class SettingProvider extends ChangeNotifier { } String _language; + String get language => _language; + Future setLanguage(String currentLanguage) async { SharedPreferences prefs = await SharedPreferences.getInstance(); prefs.setString(ASettings.language, currentLanguage); @@ -48,7 +52,9 @@ class SettingProvider extends ChangeNotifier { } String _theme; + String get theme => _theme; + Future setDarkTheme(bool value) async { SharedPreferences prefs = await SharedPreferences.getInstance(); _theme = value ? "dark" : "light"; @@ -57,7 +63,9 @@ class SettingProvider extends ChangeNotifier { } String _speechToText; + String get speechToText => _speechToText; + Future setSpeechToText(String currentLanguage) async { SharedPreferences prefs = await SharedPreferences.getInstance(); prefs.setString(ASettings.speechToText, currentLanguage); diff --git a/lib/extensions/context_extension.dart b/lib/extensions/context_extension.dart index a4b0be8d..44f1fb9b 100644 --- a/lib/extensions/context_extension.dart +++ b/lib/extensions/context_extension.dart @@ -1,9 +1,9 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:provider/provider.dart'; import '../controllers/providers/settings/setting_provider.dart'; -import 'package:flutter_gen/gen_l10n/app_localizations.dart'; extension BuildContextExtension on BuildContext { AppLocalizations get translation => AppLocalizations.of(this); @@ -11,5 +11,6 @@ extension BuildContextExtension on BuildContext { List get getIssues => [translation.reason1, translation.reason2, translation.reason3, translation.reason4, translation.reason5]; bool get isDark => Provider.of(this).theme == "dark"; + bool get isAr => Provider.of(this).language == "ar"; } diff --git a/lib/models/department.dart b/lib/models/department.dart index 36b744a5..1aa28994 100644 --- a/lib/models/department.dart +++ b/lib/models/department.dart @@ -13,6 +13,7 @@ class Department { name: parsedJson["name"], ); } + factory Department.fromDepartment(Department department) { return Department( id: department?.id, diff --git a/lib/models/device/asset_by_id_model.dart b/lib/models/device/asset_by_id_model.dart index 88514e3d..a91dc539 100644 --- a/lib/models/device/asset_by_id_model.dart +++ b/lib/models/device/asset_by_id_model.dart @@ -135,7 +135,7 @@ class AssetByIdModel { id = json['id']; print("supplier:${json['supplier']}"); modelDefinition = json['modelDefinition'] != null ? new ModelDefinition.fromJson(json['modelDefinition']) : null; - supplier = json['supplier'] != null ? Suppliers.fromJson(json['supplier']) : null; + supplier = json['supplier'] != null ? Suppliers.fromJson(json['supplier']) : null; ipAddress = json['ipAddress']; macAddress = json['macAddress']; portNumber = json['portNumber']; diff --git a/lib/models/device/asset_search.dart b/lib/models/device/asset_search.dart index a120fcdb..8fc2ea28 100644 --- a/lib/models/device/asset_search.dart +++ b/lib/models/device/asset_search.dart @@ -58,6 +58,7 @@ class AssetSearch { assetGroupName = json['assetGroupName']; assetGroup = json['assetGroup'] != null ? Lookup.fromJson(json['assetGroup']) : null; } + String code; String assetSerialNumber; String assetName; @@ -84,6 +85,7 @@ class AssetSearch { String tagCode; String assetGroupName; Lookup assetGroup; + AssetSearch copyWith({ String code, String assetSerialNumber, @@ -140,6 +142,7 @@ class AssetSearch { assetGroupName: assetGroupName ?? this.assetGroupName, assetGroup: assetGroup ?? this.assetGroup, ); + Map toJson() { final map = {}; if (code != null && code.isNotEmpty) map['code'] = code; diff --git a/lib/models/device/asset_transfer.dart b/lib/models/device/asset_transfer.dart index 26e27476..9e376f25 100644 --- a/lib/models/device/asset_transfer.dart +++ b/lib/models/device/asset_transfer.dart @@ -154,6 +154,7 @@ class AssetTransfer { supplierId = json['supplierId']; supplierName = json['supplierName']; } + num id; num transferNo; String transferCode; @@ -339,6 +340,7 @@ class AssetTransfer { senderTimer: senderTimer ?? this.senderTimer, receiverTimer: receiverTimer ?? this.receiverTimer, manufacturerName: manufacturerName ?? this.manufacturerName); + Map toJson() { final map = {}; map['id'] = id; diff --git a/lib/models/device/asset_transfer_attachment.dart b/lib/models/device/asset_transfer_attachment.dart index d202d2e7..e22aab00 100644 --- a/lib/models/device/asset_transfer_attachment.dart +++ b/lib/models/device/asset_transfer_attachment.dart @@ -8,8 +8,10 @@ class AssetTransferAttachment { id = json['id']; attachmentName = json['attachmentName']; } + num id; String attachmentName; + AssetTransferAttachment copyWith({ num id, String attachmentName, @@ -18,6 +20,7 @@ class AssetTransferAttachment { id: id ?? this.id, attachmentName: attachmentName ?? this.attachmentName, ); + Map toJson() { final map = {}; map['id'] = id; diff --git a/lib/models/device/device_transfer_info.dart b/lib/models/device/device_transfer_info.dart index 5e4c5a21..8308d784 100644 --- a/lib/models/device/device_transfer_info.dart +++ b/lib/models/device/device_transfer_info.dart @@ -79,27 +79,27 @@ class DeviceTransferInfo { status = old.status; } - // factory DeviceTransferInfo.fromJson(Map parsedJson, String key) { - // return DeviceTransferInfo( - // workingHours: parsedJson["${key}working_hours"], - // // startDate: parsedJson["${key}start_date"], - // // endDate: parsedJson["${key}end_date"], - // timer: TimerModel( - // startAt: DateTime.tryParse(parsedJson["${key}start_date"] ?? ""), - // endAt: DateTime.tryParse(parsedJson["${key}end_date"] ?? ""), - // durationInSecond: ((parsedJson["${key}working_hours"] ?? 0) * 60 * 60).toInt(), - // ), - // travelingHours: parsedJson["${key}travel_hours"], - // userName: parsedJson["${key}name"], - // signature: parsedJson["${key}image"], - // userId: parsedJson["${key}id"], - // comment: parsedJson["${key}comment"], - // assignedEmployeeName: parsedJson["${key}AssignedEmployeeName"], - // client: Hospital(id: parsedJson["${key}SiteId"], name: parsedJson["${key}SiteName"]), - // department: Department( - // id: parsedJson["${key}DepartmentId"], - // name: parsedJson["${key}DepartmentName"], - // ), - // ); - // } +// factory DeviceTransferInfo.fromJson(Map parsedJson, String key) { +// return DeviceTransferInfo( +// workingHours: parsedJson["${key}working_hours"], +// // startDate: parsedJson["${key}start_date"], +// // endDate: parsedJson["${key}end_date"], +// timer: TimerModel( +// startAt: DateTime.tryParse(parsedJson["${key}start_date"] ?? ""), +// endAt: DateTime.tryParse(parsedJson["${key}end_date"] ?? ""), +// durationInSecond: ((parsedJson["${key}working_hours"] ?? 0) * 60 * 60).toInt(), +// ), +// travelingHours: parsedJson["${key}travel_hours"], +// userName: parsedJson["${key}name"], +// signature: parsedJson["${key}image"], +// userId: parsedJson["${key}id"], +// comment: parsedJson["${key}comment"], +// assignedEmployeeName: parsedJson["${key}AssignedEmployeeName"], +// client: Hospital(id: parsedJson["${key}SiteId"], name: parsedJson["${key}SiteName"]), +// department: Department( +// id: parsedJson["${key}DepartmentId"], +// name: parsedJson["${key}DepartmentName"], +// ), +// ); +// } } diff --git a/lib/models/device/model_definition.dart b/lib/models/device/model_definition.dart index 0c3a488f..9ed23e57 100644 --- a/lib/models/device/model_definition.dart +++ b/lib/models/device/model_definition.dart @@ -44,6 +44,7 @@ class ModelDefinition { }); } } + num id; String assetName; String assetDescription; @@ -58,6 +59,7 @@ class ModelDefinition { num lifeSpan; List modelDefRelatedDefects; List suppliers; + ModelDefinition copyWith({ num id, String assetName, @@ -90,6 +92,7 @@ class ModelDefinition { modelDefRelatedDefects: modelDefRelatedDefects ?? this.modelDefRelatedDefects, suppliers: suppliers ?? this.suppliers, ); + Map toJson() { final map = {}; map['id'] = id; @@ -128,10 +131,12 @@ class ModelDefRelatedDefects { workPerformed = json['workPerformed']; estimatedTime = json['estimatedTime']; } + num id; String defectName; String workPerformed; String estimatedTime; + ModelDefRelatedDefects copyWith({ num id, String defectName, @@ -144,6 +149,7 @@ class ModelDefRelatedDefects { workPerformed: workPerformed ?? this.workPerformed, estimatedTime: estimatedTime ?? this.estimatedTime, ); + Map toJson() { final map = {}; map['id'] = id; diff --git a/lib/models/device/supplier.dart b/lib/models/device/supplier.dart index 3cc71664..e67f98de 100644 --- a/lib/models/device/supplier.dart +++ b/lib/models/device/supplier.dart @@ -8,8 +8,10 @@ class Supplier { id = json['id']; suppliername = json['suppliername']; } + num id; String suppliername; + Supplier copyWith({ num id, String suppliername, @@ -18,6 +20,7 @@ class Supplier { id: id ?? this.id, suppliername: suppliername ?? this.suppliername, ); + Map toJson() { final map = {}; map['id'] = id; diff --git a/lib/models/device/technical_guidance_book.dart b/lib/models/device/technical_guidance_book.dart index 17458c6a..b9a7bf9b 100644 --- a/lib/models/device/technical_guidance_book.dart +++ b/lib/models/device/technical_guidance_book.dart @@ -7,8 +7,10 @@ class TechnicalGuidanceBook { id = json['id']; guidanceBook = json['guidanceBook'] != null ? Lookup.fromJson(json['guidanceBook']) : null; } + num id; Lookup guidanceBook; + TechnicalGuidanceBook copyWith({ num id, Lookup guidanceBook, @@ -17,6 +19,7 @@ class TechnicalGuidanceBook { id: id ?? this.id, guidanceBook: guidanceBook ?? this.guidanceBook, ); + Map toJson() { final map = {}; map['id'] = id; diff --git a/lib/models/engineer.dart b/lib/models/engineer.dart index b285a0c4..82fa505e 100644 --- a/lib/models/engineer.dart +++ b/lib/models/engineer.dart @@ -14,6 +14,7 @@ class Engineer { name: parsedJson["userName"] ?? parsedJson["name"], ); } + factory Engineer.fromEngineer(Engineer department) { return Engineer( id: department?.id, diff --git a/lib/models/fault_description.dart b/lib/models/fault_description.dart index bc57b655..b72cabf9 100644 --- a/lib/models/fault_description.dart +++ b/lib/models/fault_description.dart @@ -6,7 +6,7 @@ class FaultDescription extends Base { this.defectName, this.workPerformed, this.estimatedTime, - }):super(name : defectName, identifier: id?.toString()); + }) : super(name: defectName, identifier: id?.toString()); FaultDescription.fromJson(dynamic json) { id = json['id']; @@ -16,10 +16,12 @@ class FaultDescription extends Base { workPerformed = json['workPerformed']; estimatedTime = json['estimatedTime']; } + num id; String defectName; String workPerformed; String estimatedTime; + FaultDescription copyWith({ num id, String defectName, @@ -32,6 +34,7 @@ class FaultDescription extends Base { workPerformed: workPerformed ?? this.workPerformed, estimatedTime: estimatedTime ?? this.estimatedTime, ); + Map toJson() { final map = {}; map['id'] = id; diff --git a/lib/models/new_models/assigned_employee.dart b/lib/models/new_models/assigned_employee.dart index 937e5f71..2393c9ef 100644 --- a/lib/models/new_models/assigned_employee.dart +++ b/lib/models/new_models/assigned_employee.dart @@ -8,8 +8,10 @@ class AssignedEmployee { id = json['id']; name = json['name']; } + String id; String name; + AssignedEmployee copyWith({ String id, String name, @@ -18,6 +20,7 @@ class AssignedEmployee { id: id ?? this.id, name: name ?? this.name, ); + Map toJson() { final map = {}; map['id'] = id; diff --git a/lib/models/new_models/assistant_employee.dart b/lib/models/new_models/assistant_employee.dart index 9a351b2f..8d1b4092 100644 --- a/lib/models/new_models/assistant_employee.dart +++ b/lib/models/new_models/assistant_employee.dart @@ -10,8 +10,10 @@ class AssistantEmployees { id = json['id']; user = json['user'] != null ? AssignedEmployee.fromJson(json['user']) : null; } + num id; AssignedEmployee user; + AssistantEmployees copyWith({ num id, AssignedEmployee user, @@ -20,6 +22,7 @@ class AssistantEmployees { id: id ?? this.id, user: user ?? this.user, ); + Map toJson() { final map = {}; map['id'] = id; diff --git a/lib/models/new_models/department.dart b/lib/models/new_models/department.dart index 2f0a5a84..b8f50c99 100644 --- a/lib/models/new_models/department.dart +++ b/lib/models/new_models/department.dart @@ -16,10 +16,12 @@ class Department extends Base { departmentCode = json['departmentCode']; ntCode = json['ntCode']; } + num id; String departmentName; String departmentCode; String ntCode; + Department copyWith({ num id, String departmentName, @@ -32,6 +34,7 @@ class Department extends Base { departmentCode: departmentCode ?? this.departmentCode, ntCode: ntCode ?? this.ntCode, ); + Map toJson() { final map = {}; map['id'] = id; diff --git a/lib/models/search_all_requests_model.dart b/lib/models/search_all_requests_model.dart index 0b524a79..e9b8597c 100644 --- a/lib/models/search_all_requests_model.dart +++ b/lib/models/search_all_requests_model.dart @@ -32,6 +32,7 @@ abstract class SearchAllRequestsBaseModel { String value; BuildContext context; TextInputType inputType; + SearchAllRequestsBaseModel(this.context, {this.label, this.value, this.inputType = TextInputType.text}); } diff --git a/lib/models/service_request/call_site_contact_person.dart b/lib/models/service_request/call_site_contact_person.dart index d9246ab2..b1c1494b 100644 --- a/lib/models/service_request/call_site_contact_person.dart +++ b/lib/models/service_request/call_site_contact_person.dart @@ -20,6 +20,7 @@ class CallSiteContactPerson { land = json['land']; contactUserId = json['contactUserId']; } + num id; String employeeCode; String name; @@ -28,6 +29,7 @@ class CallSiteContactPerson { String email; String land; String contactUserId; + CallSiteContactPerson copyWith({ num id, String employeeCode, @@ -48,6 +50,7 @@ class CallSiteContactPerson { land: land ?? this.land, contactUserId: contactUserId ?? this.contactUserId, ); + Map toJson() { final map = {}; map['id'] = id; diff --git a/lib/models/service_request/contact_person_work_order.dart b/lib/models/service_request/contact_person_work_order.dart index 0fe22b43..cf43feb5 100644 --- a/lib/models/service_request/contact_person_work_order.dart +++ b/lib/models/service_request/contact_person_work_order.dart @@ -20,6 +20,7 @@ class ContactPersonWorkOrder { land = json['land']; contactUserId = json['contactUserId']; } + num id; String employeeCode; String name; @@ -28,6 +29,7 @@ class ContactPersonWorkOrder { String email; String land; String contactUserId; + ContactPersonWorkOrder copyWith({ num id, String employeeCode, @@ -48,6 +50,7 @@ class ContactPersonWorkOrder { land: land ?? this.land, contactUserId: contactUserId ?? this.contactUserId, ); + Map toJson() { final map = {}; map['id'] = id; diff --git a/lib/models/service_request/search_work_order.dart b/lib/models/service_request/search_work_order.dart index a3c54b30..216e1bee 100644 --- a/lib/models/service_request/search_work_order.dart +++ b/lib/models/service_request/search_work_order.dart @@ -178,6 +178,7 @@ class SearchWorkOrder { Lookup currentSituation; Lookup repairLocation; Lookup reason; + // String startofWorkTime; // String endofWorkTime; num workingHours; diff --git a/lib/models/service_request/service_report.dart b/lib/models/service_request/service_report.dart index 69542229..e0b44757 100644 --- a/lib/models/service_request/service_report.dart +++ b/lib/models/service_request/service_report.dart @@ -129,6 +129,7 @@ class ServiceReport { loanAvailablity = json['loanAvailablity'] != null ? Lookup.fromJson(json['loanAvailablity']) : null; assetLoan = json['assetLoan'] != null ? AssetInfo.fromJson(json['assetLoan']) : null; } + num id; num parentWOId; String workOrderNo; @@ -167,6 +168,7 @@ class ServiceReport { Lookup loanAvailablity; AssetInfo assetLoan; TimerModel timer = TimerModel(); + ServiceReport copyWith({ num id, num parentWOId, @@ -243,6 +245,7 @@ class ServiceReport { assetLoan: assetLoan ?? this.assetLoan, timer: timer ?? this.timer, ); + Map toJson() { final map = {}; map['id'] = id ?? 0; diff --git a/lib/models/service_request/spare_parts.dart b/lib/models/service_request/spare_parts.dart index 2f080f76..6332836c 100644 --- a/lib/models/service_request/spare_parts.dart +++ b/lib/models/service_request/spare_parts.dart @@ -16,11 +16,13 @@ class SparePartsWorkOrders extends Base { returnQty = json['returnQty']; installQty = json['installQty']; } + num id; SparePart sparePart; num qty; num returnQty; num installQty; + SparePartsWorkOrders copyWith({ num id, SparePart sparePart, @@ -35,6 +37,7 @@ class SparePartsWorkOrders extends Base { returnQty: returnQty ?? this.returnQty, installQty: installQty ?? this.installQty, ); + Map toJson() { final map = {}; map['id'] = id; @@ -64,10 +67,12 @@ class SparePart extends Base { name = partName; assetId = json['assetId']; } + num id; String partNo; String partName; num assetId; + SparePart copyWith({ num id, String partNo, @@ -80,6 +85,7 @@ class SparePart extends Base { partName: partName ?? this.partName, assetId: assetId ?? this.assetId, ); + Map toJson() { final map = {}; map['id'] = id; diff --git a/lib/models/service_request/supp_engineer_work_orders.dart b/lib/models/service_request/supp_engineer_work_orders.dart index f5ab29b3..dfa20d0f 100644 --- a/lib/models/service_request/supp_engineer_work_orders.dart +++ b/lib/models/service_request/supp_engineer_work_orders.dart @@ -22,6 +22,7 @@ class SuppEngineerWorkOrders extends Base { externalEngCode = json['externalEngCode']; email = json['email']; } + num id; num supplierContactId; String personName; @@ -29,6 +30,7 @@ class SuppEngineerWorkOrders extends Base { String contact; String externalEngCode; String email; + SuppEngineerWorkOrders copyWith({ num id, num supplierContactId, @@ -47,6 +49,7 @@ class SuppEngineerWorkOrders extends Base { externalEngCode: externalEngCode ?? this.externalEngCode, email: email ?? this.email, ); + Map toJson() { final map = {}; map['id'] = id; diff --git a/lib/models/service_request/supplier_details.dart b/lib/models/service_request/supplier_details.dart index 1c5fde9c..3723daaa 100644 --- a/lib/models/service_request/supplier_details.dart +++ b/lib/models/service_request/supplier_details.dart @@ -76,6 +76,7 @@ class SupplierDetails extends Base { }); } } + num id; String suppliername; String nameX; @@ -95,6 +96,7 @@ class SupplierDetails extends Base { List attachments; List suppPersons; List suppTCodes; + SupplierDetails copyWith({ num id, String suppliername, @@ -137,6 +139,7 @@ class SupplierDetails extends Base { suppPersons: suppPersons ?? this.suppPersons, suppTCodes: suppTCodes ?? this.suppTCodes, ); + Map toJson() { final map = {}; map['id'] = id; @@ -188,10 +191,12 @@ class SuppTCodes { codeTypeId = json['codeTypeId']; codeValue = json['codeValue']; } + num id; num supplierId; num codeTypeId; String codeValue; + SuppTCodes copyWith({ num id, num supplierId, @@ -204,6 +209,7 @@ class SuppTCodes { codeTypeId: codeTypeId ?? this.codeTypeId, codeValue: codeValue ?? this.codeValue, ); + Map toJson() { final map = {}; map['id'] = id; @@ -236,6 +242,7 @@ class SuppPersons extends Base { externalEngCode = json['externalEngCode']; email = json['email']; } + num id; num supplierId; String personName; @@ -243,6 +250,7 @@ class SuppPersons extends Base { String contact; String externalEngCode; String email; + SuppPersons copyWith({ num id, num supplierId, @@ -261,6 +269,7 @@ class SuppPersons extends Base { externalEngCode: externalEngCode ?? this.externalEngCode, email: email ?? this.email, ); + Map toJson() { final map = {}; map['id'] = id; @@ -288,10 +297,12 @@ class Attachments { attachmentName = json['attachmentName']; attachmentURL = json['attachmentURL']; } + num id; num supplierId; String attachmentName; String attachmentURL; + Attachments copyWith({ num id, num supplierId, @@ -304,6 +315,7 @@ class Attachments { attachmentName: attachmentName ?? this.attachmentName, attachmentURL: attachmentURL ?? this.attachmentURL, ); + Map toJson() { final map = {}; map['id'] = id; @@ -326,9 +338,11 @@ class Addresses { supplierId = json['supplierId']; address = json['address']; } + num id; num supplierId; String address; + Addresses copyWith({ num id, num supplierId, @@ -339,6 +353,7 @@ class Addresses { supplierId: supplierId ?? this.supplierId, address: address ?? this.address, ); + Map toJson() { final map = {}; map['id'] = id; @@ -360,9 +375,11 @@ class Faxes { supplierId = json['supplierId']; fax = json['fax']; } + num id; num supplierId; String fax; + Faxes copyWith({ num id, num supplierId, @@ -373,6 +390,7 @@ class Faxes { supplierId: supplierId ?? this.supplierId, fax: fax ?? this.fax, ); + Map toJson() { final map = {}; map['id'] = id; @@ -394,9 +412,11 @@ class Telephones { supplierId = json['supplierId']; telephone = json['telephone']; } + num id; num supplierId; String telephone; + Telephones copyWith({ num id, num supplierId, @@ -407,6 +427,7 @@ class Telephones { supplierId: supplierId ?? this.supplierId, telephone: telephone ?? this.telephone, ); + Map toJson() { final map = {}; map['id'] = id; diff --git a/lib/models/service_request/wo_call_request.dart b/lib/models/service_request/wo_call_request.dart index c9d1a631..5c47648b 100644 --- a/lib/models/service_request/wo_call_request.dart +++ b/lib/models/service_request/wo_call_request.dart @@ -41,6 +41,7 @@ class CallRequest { assetLoan = json['assetLoan'] != null ? AssetInfo.fromJson(json['assetLoan']) : null; assetType = json['assetType']; } + num id; String callNo; String callComments; @@ -54,6 +55,7 @@ class CallRequest { Lookup loanAvailablity; AssetInfo assetLoan; num assetType; + CallRequest copyWith({ num id, String callNo, @@ -84,6 +86,7 @@ class CallRequest { assetLoan: assetLoan ?? this.assetLoan, assetType: assetType ?? this.assetType, ); + Map toJson() { final map = {}; map['id'] = id; diff --git a/lib/models/service_request/wo_parent.dart b/lib/models/service_request/wo_parent.dart index e8b9b3e3..37cdf467 100644 --- a/lib/models/service_request/wo_parent.dart +++ b/lib/models/service_request/wo_parent.dart @@ -34,6 +34,7 @@ class WoParent { equipmentStatus = json['equipmentStatus'] != null ? Lookup.fromJson(json['equipmentStatus']) : null; currentSituation = json['currentSituation'] != null ? Lookup.fromJson(json['currentSituation']) : null; } + Lookup callLastSituation; SupplierDetails supplier; Lookup assetType; @@ -44,6 +45,7 @@ class WoParent { List suppEngineerWorkOrders; Lookup equipmentStatus; Lookup currentSituation; + WoParent copyWith({ Lookup callLastSituation, SupplierDetails supplier, @@ -68,6 +70,7 @@ class WoParent { equipmentStatus: equipmentStatus ?? this.equipmentStatus, currentSituation: currentSituation ?? this.currentSituation, ); + Map toJson() { final map = {}; if (callLastSituation != null) { @@ -120,6 +123,7 @@ class StepsWorkOrder { parentWOId = json['parentWOId']; callId = json['callId']; } + num sequence; num id; String name; @@ -128,6 +132,7 @@ class StepsWorkOrder { bool processed; num parentWOId; num callId; + StepsWorkOrder copyWith({ num sequence, num id, @@ -148,6 +153,7 @@ class StepsWorkOrder { parentWOId: parentWOId ?? this.parentWOId, callId: callId ?? this.callId, ); + Map toJson() { final map = {}; map['sequence'] = sequence; diff --git a/lib/models/system_notification_model.dart b/lib/models/system_notification_model.dart index dbfa942e..1a3838b6 100644 --- a/lib/models/system_notification_model.dart +++ b/lib/models/system_notification_model.dart @@ -1,5 +1,3 @@ -import 'package:test_sa/views/pages/user/requests/future_request_service_details.dart'; - class SystemNotificationModel { String userId; String userName; diff --git a/lib/models/user.dart b/lib/models/user.dart index 21ac5774..4a92bdc4 100644 --- a/lib/models/user.dart +++ b/lib/models/user.dart @@ -211,9 +211,11 @@ class UserRoles { name = json['name']; value = json['value']; } + String id; String name; String value; + UserRoles copyWith({ String id, String name, @@ -224,6 +226,7 @@ class UserRoles { name: name ?? this.name, value: value ?? this.value, ); + Map toJson() { final map = {}; map['id'] = id; diff --git a/lib/new_views/app_style/app_color.dart b/lib/new_views/app_style/app_color.dart index 995c907a..47623bd6 100644 --- a/lib/new_views/app_style/app_color.dart +++ b/lib/new_views/app_style/app_color.dart @@ -2,6 +2,7 @@ import 'dart:ui'; class AppColor { AppColor._(); + //primary static const Color primary30 = Color(0xffA2E2F8); static const Color primary40 = Color(0xff75BDE0); diff --git a/lib/new_views/app_style/app_text_style.dart b/lib/new_views/app_style/app_text_style.dart index 6ebea2eb..0d0fe545 100644 --- a/lib/new_views/app_style/app_text_style.dart +++ b/lib/new_views/app_style/app_text_style.dart @@ -3,7 +3,9 @@ import 'package:test_sa/extensions/int_extensions.dart'; class AppTextStyle { static const fontFamily = "Poppins"; + AppTextStyle._(); + static final TextStyle heading1 = TextStyle( height: 1.5, fontSize: 32.toScreenWidth, diff --git a/lib/new_views/app_style/app_themes.dart b/lib/new_views/app_style/app_themes.dart index 14d76d76..7cb04cf2 100644 --- a/lib/new_views/app_style/app_themes.dart +++ b/lib/new_views/app_style/app_themes.dart @@ -4,6 +4,7 @@ import 'package:test_sa/new_views/app_style/app_text_style.dart'; class AppThemes { AppThemes._(); + static ThemeData lightTheme = ThemeData.light().copyWith( textTheme: ThemeData.light().textTheme.apply(fontFamily: AppTextStyle.fontFamily), primaryColor: AppColor.primary50, diff --git a/lib/new_views/common_widgets/app_drawer.dart b/lib/new_views/common_widgets/app_drawer.dart index c65b1379..6f22c9bb 100644 --- a/lib/new_views/common_widgets/app_drawer.dart +++ b/lib/new_views/common_widgets/app_drawer.dart @@ -6,7 +6,6 @@ import 'package:test_sa/extensions/int_extensions.dart'; import 'package:test_sa/extensions/text_extensions.dart'; import 'package:test_sa/extensions/widget_extensions.dart'; import 'package:test_sa/new_views/app_style/app_color.dart'; -import 'package:test_sa/views/app_style/colors.dart'; import 'package:test_sa/views/app_style/sizing.dart'; import 'package:test_sa/views/pages/user/notifications/notifications_page.dart'; @@ -41,10 +40,10 @@ class AppDrawer extends StatelessWidget { padding: const EdgeInsets.all(1), // Border radius child: ClipOval( child: snapshot.profileImage != null - ? Image.file(snapshot.profileImage) - : (snapshot.user.profilePhotoName?.isNotEmpty ?? false) - ? Image.network(snapshot.user.profilePhotoName) - : const Icon( + ? Image.file(snapshot.profileImage) + : (snapshot.user.profilePhotoName?.isNotEmpty ?? false) + ? Image.network(snapshot.user.profilePhotoName) + : const Icon( Icons.person, size: 50, color: Colors.white, @@ -96,7 +95,7 @@ class AppDrawer extends StatelessWidget { userProvider.reset(); Navigator.of(context).pop(); Navigator.of(context).pop(); - // Navigator.of(context).pop(); + // Navigator.of(context).pop(); } }), 18.height, diff --git a/lib/new_views/common_widgets/app_loading_manager.dart b/lib/new_views/common_widgets/app_loading_manager.dart index 7448058b..8e3882bb 100644 --- a/lib/new_views/common_widgets/app_loading_manager.dart +++ b/lib/new_views/common_widgets/app_loading_manager.dart @@ -1,7 +1,6 @@ import 'package:flutter/material.dart'; import 'package:test_sa/extensions/context_extension.dart'; import 'package:test_sa/extensions/int_extensions.dart'; -import 'package:test_sa/models/enums/translation_keys.dart'; import 'package:test_sa/new_views/common_widgets/app_lazy_loading.dart'; import '../app_style/app_color.dart'; diff --git a/lib/new_views/common_widgets/app_search_field.dart b/lib/new_views/common_widgets/app_search_field.dart index 09286d5f..615e5506 100644 --- a/lib/new_views/common_widgets/app_search_field.dart +++ b/lib/new_views/common_widgets/app_search_field.dart @@ -2,11 +2,10 @@ import 'package:flutter/material.dart'; import 'package:test_sa/extensions/context_extension.dart'; import 'package:test_sa/new_views/app_style/app_color.dart'; -import '../../models/enums/translation_keys.dart'; - class AppSearchField extends StatefulWidget { final Function(String) onChanged; final Function(String) onSubmitted; + const AppSearchField({Key key, this.onChanged, this.onSubmitted}) : super(key: key); @override @@ -18,19 +17,20 @@ class _AppSearchFieldState extends State { Widget build(BuildContext context) { return TextField( onChanged: widget.onChanged, - onSubmitted: widget.onSubmitted, - decoration: InputDecoration( - prefixIcon: const Icon(Icons.search, color: AppColor.neutral20,), - hintText: context.translation.search, - hintStyle: TextStyle( - fontSize: Theme.of(context).textTheme.bodySmall.fontSize - ), - filled: true, - fillColor: AppColor.neutral30, - border: OutlineInputBorder( - borderRadius: BorderRadius.circular(15), - borderSide: BorderSide.none, - )), + onSubmitted: widget.onSubmitted, + decoration: InputDecoration( + prefixIcon: const Icon( + Icons.search, + color: AppColor.neutral20, + ), + hintText: context.translation.search, + hintStyle: TextStyle(fontSize: Theme.of(context).textTheme.bodySmall.fontSize), + filled: true, + fillColor: AppColor.neutral30, + border: OutlineInputBorder( + borderRadius: BorderRadius.circular(15), + borderSide: BorderSide.none, + )), ); } } diff --git a/lib/new_views/common_widgets/app_tab_bar.dart b/lib/new_views/common_widgets/app_tab_bar.dart index 4aab61f3..529d0f8a 100644 --- a/lib/new_views/common_widgets/app_tab_bar.dart +++ b/lib/new_views/common_widgets/app_tab_bar.dart @@ -1,23 +1,22 @@ import 'package:flutter/material.dart'; class AppTabBar extends StatelessWidget { - const AppTabBar({Key key}) : super(key: key); @override Widget build(BuildContext context) { return TabBar( - tabs:[ - Tab( - icon: Icon(Icons.cloud_outlined), - ), - Tab( - icon: Icon(Icons.beach_access_sharp), - ), - Tab( - icon: Icon(Icons.brightness_5_sharp), - ), - ], + tabs: [ + Tab( + icon: Icon(Icons.cloud_outlined), + ), + Tab( + icon: Icon(Icons.beach_access_sharp), + ), + Tab( + icon: Icon(Icons.brightness_5_sharp), + ), + ], ); } } diff --git a/lib/new_views/pages/help_center_page.dart b/lib/new_views/pages/help_center_page.dart index c8e49b88..395c1e7a 100644 --- a/lib/new_views/pages/help_center_page.dart +++ b/lib/new_views/pages/help_center_page.dart @@ -7,6 +7,7 @@ import '../common_widgets/default_app_bar.dart'; class HelpCenterPage extends StatelessWidget { static const id = "/help_center_page"; + const HelpCenterPage({Key key}) : super(key: key); @override diff --git a/lib/new_views/pages/land_page/calendar_page.dart b/lib/new_views/pages/land_page/calendar_page.dart index e5f72479..37e5d84b 100644 --- a/lib/new_views/pages/land_page/calendar_page.dart +++ b/lib/new_views/pages/land_page/calendar_page.dart @@ -42,21 +42,21 @@ class _CalendarPageState extends State with SingleTickerProviderSt context.translation.myShift.heading5(context), 8.height, context.translation.sunToThurs.bodyText(context), - "09:00 to 18:00".bodyText(context).custom(color: context.isDark? AppColor.neutral10: AppColor.neutral50), + "09:00 to 18:00".bodyText(context).custom(color: context.isDark ? AppColor.neutral10 : AppColor.neutral50), ], ).toShadowContainer(context), ).paddingOnly(start: 16, end: 16), 16.height, Container( margin: const EdgeInsets.only(left: 16, right: 16), - decoration: BoxDecoration(color: context.isDark? AppColor.neutral10: AppColor.neutral30, borderRadius: BorderRadius.circular(16)), + decoration: BoxDecoration(color: context.isDark ? AppColor.neutral10 : AppColor.neutral30, borderRadius: BorderRadius.circular(16)), child: TabBar( controller: _tabController, padding: EdgeInsets.zero, labelColor: AppColor.neutral60, unselectedLabelColor: AppColor.neutral20, indicatorPadding: const EdgeInsets.all(4), - indicator: BoxDecoration(color: context.isDark? AppColor.neutral20:Theme.of(context).cardColor, borderRadius: BorderRadius.circular(13)), + indicator: BoxDecoration(color: context.isDark ? AppColor.neutral20 : Theme.of(context).cardColor, borderRadius: BorderRadius.circular(13)), onTap: (index) { setState(() {}); }, diff --git a/lib/new_views/pages/land_page/calender_fragments/calendar_header.dart b/lib/new_views/pages/land_page/calender_fragments/calendar_header.dart index c1b7b215..073d98e8 100644 --- a/lib/new_views/pages/land_page/calender_fragments/calendar_header.dart +++ b/lib/new_views/pages/land_page/calender_fragments/calendar_header.dart @@ -10,6 +10,7 @@ import '../../../app_style/app_color.dart'; class CalendarHeader extends StatelessWidget { final DateTime dateTime; final DateFormat dateFormat; + const CalendarHeader({@required this.dateTime, @required this.dateFormat, Key key}) : super(key: key); @override @@ -20,9 +21,9 @@ class CalendarHeader extends StatelessWidget { children: [ dateFormat.format(dateTime).heading5(context), 6.width, - Align(alignment: AlignmentDirectional.centerEnd, child: Icon(Icons.keyboard_arrow_down_sharp, color: context.isDark? AppColor.neutral10:AppColor.neutral60, size: 24)), + Align(alignment: AlignmentDirectional.centerEnd, child: Icon(Icons.keyboard_arrow_down_sharp, color: context.isDark ? AppColor.neutral10 : AppColor.neutral60, size: 24)), const Spacer(), - Align(alignment: AlignmentDirectional.centerEnd, child: Icon(Icons.calendar_today, color: context.isDark? AppColor.neutral10:AppColor.neutral60, size: 18)), + Align(alignment: AlignmentDirectional.centerEnd, child: Icon(Icons.calendar_today, color: context.isDark ? AppColor.neutral10 : AppColor.neutral60, size: 18)), ], ), 8.height, diff --git a/lib/new_views/pages/land_page/calender_fragments/calender_days_card.dart b/lib/new_views/pages/land_page/calender_fragments/calender_days_card.dart index a3c05d18..4bcc3f68 100644 --- a/lib/new_views/pages/land_page/calender_fragments/calender_days_card.dart +++ b/lib/new_views/pages/land_page/calender_fragments/calender_days_card.dart @@ -7,6 +7,7 @@ import '../../../app_style/app_color.dart'; class CalendarDaysCard extends StatelessWidget { final String day; final bool fill; + const CalendarDaysCard({Key key, @required this.day, this.fill = false}) : super(key: key); @override diff --git a/lib/new_views/pages/land_page/calender_fragments/monthly_fragment.dart b/lib/new_views/pages/land_page/calender_fragments/monthly_fragment.dart index 7d153145..1890b032 100644 --- a/lib/new_views/pages/land_page/calender_fragments/monthly_fragment.dart +++ b/lib/new_views/pages/land_page/calender_fragments/monthly_fragment.dart @@ -28,10 +28,8 @@ class _MonthlyFragmentState extends State { _initialDate = DateTime.now(); _firstDate = DateTime.utc(2010, 10, 16); _lastDate = DateTime.utc(2030, 3, 14); - Provider.of(context, listen: false).getCalenderRequests( - from: DateTime(DateTime.now().year, DateTime.now().month, 1), - to:DateTime(DateTime.now().year, DateTime.now().month +1, 0) - ); + Provider.of(context, listen: false) + .getCalenderRequests(from: DateTime(DateTime.now().year, DateTime.now().month, 1), to: DateTime(DateTime.now().year, DateTime.now().month + 1, 0)); } @override @@ -59,9 +57,7 @@ class _MonthlyFragmentState extends State { initialDatePickerMode: DatePickerMode.year, ); if (result != null) { - await snapshot.getCalenderRequests( - from: DateTime(result.year, result.month, 1), - to: DateTime(result.year, result.month+1, 0)); + await snapshot.getCalenderRequests(from: DateTime(result.year, result.month, 1), to: DateTime(result.year, result.month + 1, 0)); _initialDate = result; setState(() {}); } diff --git a/lib/new_views/pages/land_page/calender_fragments/weekly_fragment.dart b/lib/new_views/pages/land_page/calender_fragments/weekly_fragment.dart index f8e2801e..a0d0952c 100644 --- a/lib/new_views/pages/land_page/calender_fragments/weekly_fragment.dart +++ b/lib/new_views/pages/land_page/calender_fragments/weekly_fragment.dart @@ -33,9 +33,8 @@ class _WeeklyFragmentState extends State { _initialDate = DateTime.now(); _firstDate = DateTime.utc(2010, 10, 16); _lastDate = DateTime.utc(2030, 3, 14); - Provider.of(context, listen: false).getCalenderRequests( - from: DateTime.now().subtract(Duration(days: DateTime.now().weekday)), - to: DateTime.now().add(Duration(days: DateTime.daysPerWeek - DateTime.now().weekday -1))); + Provider.of(context, listen: false) + .getCalenderRequests(from: DateTime.now().subtract(Duration(days: DateTime.now().weekday)), to: DateTime.now().add(Duration(days: DateTime.daysPerWeek - DateTime.now().weekday - 1))); } @override @@ -61,7 +60,8 @@ class _WeeklyFragmentState extends State { onPageChanged: (date) { _initialDate = date; - Provider.of(context, listen: false).getCalenderRequests(from: date.subtract(Duration(days: date.weekday)), to: date.add(Duration(days: DateTime.daysPerWeek - date.weekday -1))); + Provider.of(context, listen: false) + .getCalenderRequests(from: date.subtract(Duration(days: date.weekday)), to: date.add(Duration(days: DateTime.daysPerWeek - date.weekday - 1))); }, calendarBuilders: CalendarBuilders( headerTitleBuilder: (context, dateTime) => Column( @@ -74,7 +74,7 @@ class _WeeklyFragmentState extends State { ), dowBuilder: (context, dateTime) { final day = DateFormat("EE", context.isAr ? "ar" : "en").format(dateTime).toUpperCase(); - return Align(alignment: Alignment.center, child: day.bodyText(context).custom(color: context.isDark? AppColor.neutral10: AppColor.neutral50)); + return Align(alignment: Alignment.center, child: day.bodyText(context).custom(color: context.isDark ? AppColor.neutral10 : AppColor.neutral50)); }, defaultBuilder: (context, dateTime, _) { final day = DateFormat("d").format(dateTime); diff --git a/lib/new_views/pages/land_page/dashboard_fragments/progress_fragment.dart b/lib/new_views/pages/land_page/dashboard_fragments/progress_fragment.dart index 7a97d79a..6d567f02 100644 --- a/lib/new_views/pages/land_page/dashboard_fragments/progress_fragment.dart +++ b/lib/new_views/pages/land_page/dashboard_fragments/progress_fragment.dart @@ -1,18 +1,12 @@ import 'package:flutter/material.dart'; import 'package:pie_chart/pie_chart.dart'; - import 'package:provider/provider.dart'; import 'package:test_sa/controllers/providers/api/all_requests_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'; import 'package:test_sa/extensions/widget_extensions.dart'; -import 'package:test_sa/models/all_requests_and_count_model.dart'; import 'package:test_sa/new_views/app_style/app_color.dart'; -import 'package:test_sa/new_views/pages/land_page/requests/asset_item_view.dart'; -import 'package:test_sa/new_views/pages/land_page/requests/gas_refill_item_view.dart'; -import 'package:test_sa/new_views/pages/land_page/requests/ppm_item_view.dart'; -import 'package:test_sa/new_views/pages/land_page/requests/service_request_item_view.dart'; import 'package:test_sa/new_views/pages/land_page/widgets/request_item_view_list.dart'; import 'package:test_sa/views/app_style/colors.dart'; diff --git a/lib/new_views/pages/land_page/dashboard_fragments/requests_fragment.dart b/lib/new_views/pages/land_page/dashboard_fragments/requests_fragment.dart index e5860326..aa5a2a63 100644 --- a/lib/new_views/pages/land_page/dashboard_fragments/requests_fragment.dart +++ b/lib/new_views/pages/land_page/dashboard_fragments/requests_fragment.dart @@ -50,7 +50,9 @@ class RequestsFragment extends StatelessWidget { ).expanded, Text( "$title\n${context.translation.requests}", - style: AppTextStyles.heading5.copyWith(color: context.isDark ? AppColor.neutral30 : AppColor.neutral50,), + style: AppTextStyles.heading5.copyWith( + color: context.isDark ? AppColor.neutral30 : AppColor.neutral50, + ), ).toShimmer(isShow: isLoading), 8.height, Row( diff --git a/lib/new_views/pages/land_page/home_app_bar.dart b/lib/new_views/pages/land_page/home_app_bar.dart index e79864b2..fe852e4a 100644 --- a/lib/new_views/pages/land_page/home_app_bar.dart +++ b/lib/new_views/pages/land_page/home_app_bar.dart @@ -6,6 +6,7 @@ import '../../app_style/app_color.dart'; class HomeAppBar extends StatelessWidget implements PreferredSizeWidget { final GlobalKey scaffoldKey; + const HomeAppBar({Key key, this.scaffoldKey}) : super(key: key); @override diff --git a/lib/new_views/pages/land_page/my_request/all_requests_filter_page.dart b/lib/new_views/pages/land_page/my_request/all_requests_filter_page.dart index 8dcef36e..b1701f6f 100644 --- a/lib/new_views/pages/land_page/my_request/all_requests_filter_page.dart +++ b/lib/new_views/pages/land_page/my_request/all_requests_filter_page.dart @@ -12,11 +12,11 @@ import 'package:test_sa/views/widgets/date_and_time/date_picker.dart'; import '../../../../controllers/providers/api/all_requests_provider.dart'; import '../../../app_style/app_color.dart'; import '../../../common_widgets/app_lazy_loading.dart'; -import '../../../common_widgets/default_app_bar.dart'; class AllRequestsFilterPage extends StatefulWidget { static const String id = "all_requests_filter_page"; final SearchAllRequestsModel data; + const AllRequestsFilterPage({Key key, this.data}) : super(key: key); @override @@ -25,6 +25,7 @@ class AllRequestsFilterPage extends StatefulWidget { class _AllRequestsFilterPageState extends State { SearchAllRequestsModel search; + @override void initState() { search = widget.data; @@ -75,13 +76,14 @@ class _AllRequestsFilterPageState extends State { Row( crossAxisAlignment: CrossAxisAlignment.center, children: [ - Text(context.translation.reset, + Text( + context.translation.reset, style: AppTextStyles.bodyText2.copyWith(color: const Color(0xFF4A8DB7)), ).paddingAll(8).onPress(() { setState(() { search.statuses.clear(); search.typeTransaction.clear(); - search.startDate=null; + search.startDate = null; search.endDate = null; }); }), diff --git a/lib/new_views/pages/land_page/my_request/all_requests_search_page.dart b/lib/new_views/pages/land_page/my_request/all_requests_search_page.dart index 2bfedc68..1add10b4 100644 --- a/lib/new_views/pages/land_page/my_request/all_requests_search_page.dart +++ b/lib/new_views/pages/land_page/my_request/all_requests_search_page.dart @@ -16,6 +16,7 @@ import '../widgets/request_search_buttons.dart'; class AllRequestsSearchPage extends StatefulWidget { static const String id = "all_requests_search_page"; final SearchAllRequestsModel data; + const AllRequestsSearchPage({Key key, this.data}) : super(key: key); @override diff --git a/lib/new_views/pages/land_page/my_request/my_requests_page.dart b/lib/new_views/pages/land_page/my_request/my_requests_page.dart index aec4d6a4..c89707eb 100644 --- a/lib/new_views/pages/land_page/my_request/my_requests_page.dart +++ b/lib/new_views/pages/land_page/my_request/my_requests_page.dart @@ -99,7 +99,7 @@ class _MyRequestsPageState extends State { alignment: Alignment.center, padding: const EdgeInsets.symmetric(horizontal: 8), decoration: ShapeDecoration( - color: selectedRequest == index ? Color(0xFFEAF1F4):Colors.white, + color: selectedRequest == index ? Color(0xFFEAF1F4) : Colors.white, shape: RoundedRectangleBorder( side: BorderSide(width: 1, color: selectedRequest == index ? Color(0xFF4A8DB7) : Colors.white), borderRadius: BorderRadius.circular(7), diff --git a/lib/new_views/pages/land_page/requests/asset_item_view.dart b/lib/new_views/pages/land_page/requests/asset_item_view.dart index b8cc2c4f..ff590ef5 100644 --- a/lib/new_views/pages/land_page/requests/asset_item_view.dart +++ b/lib/new_views/pages/land_page/requests/asset_item_view.dart @@ -1,20 +1,15 @@ import 'package:flutter/material.dart'; -import 'package:test_sa/controllers/api_routes/urls.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'; import 'package:test_sa/extensions/text_extensions.dart'; import 'package:test_sa/extensions/widget_extensions.dart'; import 'package:test_sa/models/all_requests_and_count_model.dart'; -import 'package:test_sa/models/device/asset.dart'; import 'package:test_sa/models/device/asset_transfer.dart'; import 'package:test_sa/views/app_style/colors.dart'; import 'package:test_sa/views/pages/device_transfer/device_transfer_details.dart'; import 'package:test_sa/views/widgets/requests/request_status.dart'; -import '../../../../models/device/asset_transfer.dart'; -import '../../../../views/pages/device_transfer/device_transfer_details.dart'; - class AssetItemView extends StatelessWidget { final RequestsDetails request; final bool showShadow; @@ -30,8 +25,8 @@ class AssetItemView extends StatelessWidget { Row( crossAxisAlignment: CrossAxisAlignment.start, children: [ - if(request.priority != null) - StatusLabel(label: request.priority??"", textColor: AColors.getRequestStatusTextColorByName(request.priority), backgroundColor: AColors.getRequestStatusColorByName(request.priority)), + if (request.priority != null) + StatusLabel(label: request.priority ?? "", textColor: AColors.getRequestStatusTextColorByName(request.priority), backgroundColor: AColors.getRequestStatusColorByName(request.priority)), 8.width, //if(request.status != null) // StatusLabel( @@ -79,7 +74,7 @@ class AssetItemView extends StatelessWidget { ], ), ], - ).toShadowContainer(context,showShadow: showShadow).onPress(() { + ).toShadowContainer(context, showShadow: showShadow).onPress(() { Navigator.of(context).push(MaterialPageRoute(builder: (_) => DeviceTransferDetails(model: AssetTransfer(id: request.id)))); }); } diff --git a/lib/new_views/pages/land_page/requests/ppm_item_view.dart b/lib/new_views/pages/land_page/requests/ppm_item_view.dart index 20e31fa6..dd026938 100644 --- a/lib/new_views/pages/land_page/requests/ppm_item_view.dart +++ b/lib/new_views/pages/land_page/requests/ppm_item_view.dart @@ -1,12 +1,10 @@ import 'package:flutter/material.dart'; -import 'package:provider/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'; import 'package:test_sa/extensions/text_extensions.dart'; import 'package:test_sa/extensions/widget_extensions.dart'; import 'package:test_sa/models/all_requests_and_count_model.dart'; -import 'package:test_sa/models/enums/user_types.dart'; import 'package:test_sa/models/visits/visit.dart'; import 'package:test_sa/views/app_style/colors.dart'; import 'package:test_sa/views/pages/user/visits/visit_details.dart'; @@ -36,15 +34,15 @@ class PpmItemView extends StatelessWidget { backgroundColor: AColors.getRequestStatusColorByName(request.status), ), 1.width.expanded, - Text(request.date?.toServiceRequestCardFormat ?? "", textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: context.isDark?AppColor.neutral10: Color(0xFF3B3D4A))), + Text(request.date?.toServiceRequestCardFormat ?? "", textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: context.isDark ? AppColor.neutral10 : Color(0xFF3B3D4A))), ], ), 8.height, context.translation.ppmRequest.heading5(context), 8.height, - '${context.translation.assetNumber}: ${request.assetName}'.bodyText(context), - '${context.translation.assetSN}: ${request.assetNo}'.bodyText(context), - '${context.translation.code}: ${request.code}'.bodyText(context), + '${context.translation.assetNumber}: ${request.assetName}'.bodyText(context), + '${context.translation.assetSN}: ${request.assetNo}'.bodyText(context), + '${context.translation.code}: ${request.code}'.bodyText(context), 16.height, Row( mainAxisSize: MainAxisSize.min, diff --git a/lib/new_views/pages/land_page/requests/service_request_item_view.dart b/lib/new_views/pages/land_page/requests/service_request_item_view.dart index 7a93e935..104ffbc8 100644 --- a/lib/new_views/pages/land_page/requests/service_request_item_view.dart +++ b/lib/new_views/pages/land_page/requests/service_request_item_view.dart @@ -30,15 +30,15 @@ class ServiceRequestItemView extends StatelessWidget { 8.width, StatusLabel(label: request.status, textColor: AColors.getRequestStatusTextColorByName(request.status), backgroundColor: AColors.getRequestStatusColorByName(request.status)), 1.width.expanded, - Text(request.date.toServiceRequestCardFormat, textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: context.isDark?AppColor.neutral10: Color(0xFF3B3D4A))), + Text(request.date.toServiceRequestCardFormat, textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: context.isDark ? AppColor.neutral10 : Color(0xFF3B3D4A))), ], ), 8.height, context.translation.serviceRequest.heading5(context), - '${context.translation.assetName}: ${request.assetName}'.bodyText(context), - '${context.translation.assetNumber}: ${request.assetNo}'.bodyText(context), - '${context.translation.requestType}: ${request.requestType}'.bodyText(context), - '${context.translation.requestNo}: ${request.requestNo}'.bodyText(context), + '${context.translation.assetName}: ${request.assetName}'.bodyText(context), + '${context.translation.assetNumber}: ${request.assetNo}'.bodyText(context), + '${context.translation.requestType}: ${request.requestType}'.bodyText(context), + '${context.translation.requestNo}: ${request.requestNo}'.bodyText(context), 8.height, Row( mainAxisSize: MainAxisSize.min, diff --git a/lib/new_views/pages/login_page.dart b/lib/new_views/pages/login_page.dart index 6e994108..64ed8ed5 100644 --- a/lib/new_views/pages/login_page.dart +++ b/lib/new_views/pages/login_page.dart @@ -12,7 +12,6 @@ import '../../controllers/providers/api/user_provider.dart'; import '../../controllers/providers/settings/setting_provider.dart'; import '../../controllers/validator/validator.dart'; import '../../models/user.dart'; -import '../../views/pages/user/land_page.dart' as old; import '../common_widgets/app_filled_button.dart'; import '../common_widgets/app_text_form_field.dart'; diff --git a/lib/new_views/pages/report_bug_page.dart b/lib/new_views/pages/report_bug_page.dart index 18d0492f..e374893a 100644 --- a/lib/new_views/pages/report_bug_page.dart +++ b/lib/new_views/pages/report_bug_page.dart @@ -12,6 +12,7 @@ import '../common_widgets/default_app_bar.dart'; class ReportBugPage extends StatelessWidget { static const id = "/report_bug_page"; + const ReportBugPage({Key key}) : super(key: key); @override diff --git a/lib/new_views/pages/settings_page.dart b/lib/new_views/pages/settings_page.dart index ea136cc1..82769b9e 100644 --- a/lib/new_views/pages/settings_page.dart +++ b/lib/new_views/pages/settings_page.dart @@ -12,6 +12,7 @@ import '../common_widgets/default_app_bar.dart'; class SettingsPage extends StatefulWidget { static const id = "/settings_page"; + const SettingsPage({Key key}) : super(key: key); @override diff --git a/lib/new_views/pages/splash_page.dart b/lib/new_views/pages/splash_page.dart index 433bd7f6..c721f66c 100644 --- a/lib/new_views/pages/splash_page.dart +++ b/lib/new_views/pages/splash_page.dart @@ -1,5 +1,3 @@ -import 'dart:convert'; - import 'package:firebase_core/firebase_core.dart'; import 'package:flare_flutter/flare_actor.dart'; import 'package:flutter/material.dart'; @@ -8,15 +6,14 @@ import 'package:test_sa/controllers/notification/notification_manger.dart'; import 'package:test_sa/controllers/providers/api/user_provider.dart'; import 'package:test_sa/controllers/providers/settings/setting_provider.dart'; import 'package:test_sa/extensions/widget_extensions.dart'; -import 'package:test_sa/models/system_notification_model.dart'; import 'package:test_sa/new_views/pages/land_page/land_page.dart'; import 'package:test_sa/new_views/pages/login_page.dart'; import '../../models/size_config.dart'; -import '../../views/pages/user/land_page.dart' as old; class SplashPage extends StatefulWidget { static const String routeName = '/splash_page'; + const SplashPage({Key key}) : super(key: key); @override diff --git a/lib/views/pages/device_transfer/asset_filter_screen.dart b/lib/views/pages/device_transfer/asset_filter_screen.dart index 6dfc3fce..50939645 100644 --- a/lib/views/pages/device_transfer/asset_filter_screen.dart +++ b/lib/views/pages/device_transfer/asset_filter_screen.dart @@ -16,12 +16,12 @@ import 'package:test_sa/views/widgets/date_and_time/date_picker.dart'; import '../../../models/device/asset_search.dart'; import '../../../new_views/app_style/app_color.dart'; import '../../../new_views/common_widgets/app_lazy_loading.dart'; -import '../../../new_views/common_widgets/default_app_bar.dart'; import '../../widgets/equipment/equipment_status_buttons.dart'; class AssetFilterScreen extends StatefulWidget { static const String id = "asset_filter_screen"; final AssetSearch data; + const AssetFilterScreen({Key key, this.data}) : super(key: key); @override @@ -33,6 +33,7 @@ class _AssetFilterScreenState extends State { Site _site; Department _department; int initialvalue; + @override void initState() { filter = widget.data ?? AssetSearch(); @@ -60,13 +61,14 @@ class _AssetFilterScreenState extends State { Row( crossAxisAlignment: CrossAxisAlignment.center, children: [ - Text(context.translation.reset, + Text( + context.translation.reset, style: AppTextStyles.bodyText2.copyWith(color: const Color(0xFF4A8DB7)), ).paddingAll(8).onPress(() { setState(() { _department = null; _site = null; - initialvalue=null; + initialvalue = null; }); }), ], @@ -80,11 +82,13 @@ class _AssetFilterScreenState extends State { crossAxisAlignment: CrossAxisAlignment.stretch, children: [ /// todo : TBD - EquipmentStatusButtons(onSelect: (value) { - if (value == null) { - /// the selected value is [All Assets] - } - }, initialvalue: initialvalue, + EquipmentStatusButtons( + onSelect: (value) { + if (value == null) { + /// the selected value is [All Assets] + } + }, + initialvalue: initialvalue, ), 16.height, SingleItemDropDownMenu( diff --git a/lib/views/pages/device_transfer/asset_search_screen.dart b/lib/views/pages/device_transfer/asset_search_screen.dart index da0dcb37..547d53e0 100644 --- a/lib/views/pages/device_transfer/asset_search_screen.dart +++ b/lib/views/pages/device_transfer/asset_search_screen.dart @@ -15,6 +15,7 @@ import '../../../new_views/common_widgets/default_app_bar.dart'; class AssetSearchScreen extends StatefulWidget { static const String id = "asset_search_screen"; final AssetSearch data; + const AssetSearchScreen({Key key, this.data}) : super(key: key); @override diff --git a/lib/views/pages/device_transfer/track_device_transfer.dart b/lib/views/pages/device_transfer/track_device_transfer.dart index 012a7040..373a67d2 100644 --- a/lib/views/pages/device_transfer/track_device_transfer.dart +++ b/lib/views/pages/device_transfer/track_device_transfer.dart @@ -4,13 +4,10 @@ import 'package:test_sa/controllers/providers/api/asset_transfer_provider.dart'; import 'package:test_sa/controllers/providers/api/user_provider.dart'; import 'package:test_sa/controllers/providers/settings/setting_provider.dart'; import 'package:test_sa/extensions/context_extension.dart'; -import 'package:test_sa/views/app_style/colors.dart'; -import 'package:test_sa/views/widgets/buttons/app_back_button.dart'; import 'package:test_sa/views/widgets/device_trancfer/device_transfer_list.dart'; import 'package:test_sa/views/widgets/loaders/loading_manager.dart'; import '../../../new_views/common_widgets/default_app_bar.dart'; -import '../../widgets/buttons/app_icon_button.dart'; class TrackDeviceTransferPage extends StatefulWidget { static const String id = "/track-device-transfer"; diff --git a/lib/views/pages/login.dart b/lib/views/pages/login.dart index d4554222..0872b5fe 100644 --- a/lib/views/pages/login.dart +++ b/lib/views/pages/login.dart @@ -2,12 +2,10 @@ import 'package:flutter/material.dart'; import 'package:fluttertoast/fluttertoast.dart'; import 'package:provider/provider.dart'; import 'package:test_sa/controllers/api_routes/http_status_manger.dart'; -import 'package:test_sa/controllers/localization/localization.dart'; import 'package:test_sa/controllers/providers/api/user_provider.dart'; import 'package:test_sa/controllers/providers/settings/setting_provider.dart'; import 'package:test_sa/controllers/validator/validator.dart'; import 'package:test_sa/extensions/context_extension.dart'; -import 'package:test_sa/models/subtitle.dart'; import 'package:test_sa/models/user.dart'; import 'package:test_sa/new_views/pages/land_page/land_page.dart'; import 'package:test_sa/views/app_style/sizing.dart'; diff --git a/lib/views/pages/register.dart b/lib/views/pages/register.dart index 56c190dc..e7a80cbf 100644 --- a/lib/views/pages/register.dart +++ b/lib/views/pages/register.dart @@ -2,13 +2,11 @@ import 'package:flutter/material.dart'; import 'package:fluttertoast/fluttertoast.dart'; import 'package:provider/provider.dart'; import 'package:test_sa/controllers/api_routes/http_status_manger.dart'; -import 'package:test_sa/controllers/localization/localization.dart'; import 'package:test_sa/controllers/providers/api/user_provider.dart'; import 'package:test_sa/controllers/providers/settings/setting_provider.dart'; import 'package:test_sa/controllers/validator/validator.dart'; import 'package:test_sa/extensions/context_extension.dart'; import 'package:test_sa/models/hospital.dart'; -import 'package:test_sa/models/subtitle.dart'; import 'package:test_sa/models/user.dart'; import 'package:test_sa/views/widgets/app_text_form_field.dart'; import 'package:test_sa/views/widgets/buttons/app_back_button.dart'; diff --git a/lib/views/pages/splash_screen.dart b/lib/views/pages/splash_screen.dart index 9eaf7ab6..879c9bb4 100644 --- a/lib/views/pages/splash_screen.dart +++ b/lib/views/pages/splash_screen.dart @@ -1,5 +1,3 @@ -import 'dart:convert'; - import 'package:firebase_core/firebase_core.dart'; import 'package:flare_flutter/flare_actor.dart'; import 'package:flutter/material.dart'; @@ -7,15 +5,14 @@ import 'package:provider/provider.dart'; import 'package:test_sa/controllers/notification/notification_manger.dart'; import 'package:test_sa/controllers/providers/api/user_provider.dart'; import 'package:test_sa/controllers/providers/settings/setting_provider.dart'; -import 'package:test_sa/models/system_notification_model.dart'; import 'package:test_sa/models/user.dart'; import 'package:test_sa/new_views/pages/land_page/land_page.dart'; - import 'login.dart'; class SplashScreen extends StatefulWidget { static const String id = '/splash'; + const SplashScreen({Key key}) : super(key: key); @override diff --git a/lib/views/pages/sub_workorder/auto_generated_vendor_name.dart b/lib/views/pages/sub_workorder/auto_generated_vendor_name.dart index 79465390..2b7a2902 100644 --- a/lib/views/pages/sub_workorder/auto_generated_vendor_name.dart +++ b/lib/views/pages/sub_workorder/auto_generated_vendor_name.dart @@ -9,6 +9,7 @@ import '../../../providers/work_order/vendor_provider.dart'; class AutoGeneratedVendorName extends StatefulWidget { final String initialValue; final Function(SupplierDetails) onSearch; + const AutoGeneratedVendorName({Key key, this.initialValue, this.onSearch}) : super(key: key); @override diff --git a/lib/views/pages/sub_workorder/create_sub_workorder_page.dart b/lib/views/pages/sub_workorder/create_sub_workorder_page.dart index 60d822d7..1d7f61ee 100644 --- a/lib/views/pages/sub_workorder/create_sub_workorder_page.dart +++ b/lib/views/pages/sub_workorder/create_sub_workorder_page.dart @@ -36,7 +36,6 @@ import '../../../new_views/common_widgets/single_item_drop_down_menu.dart'; import '../../../providers/loading_list_notifier.dart'; import '../../../providers/work_order/reason_provider.dart'; import '../../widgets/date_and_time/date_picker.dart'; -import '../../widgets/e_signature/e_signature.dart'; import '../../widgets/loaders/loading_manager.dart'; import '../../widgets/status/report/service_report_assistant_employee_menu.dart'; import '../../widgets/status/report/service_report_fault_description.dart'; @@ -63,8 +62,7 @@ class _CreateSubWorkOrderPageState extends State { bool _showVendorFields = false; SuppEngineerWorkOrders engineer; SupplierDetails initialSupplier; - final TextEditingController _workPreformedController = - TextEditingController(); + final TextEditingController _workPreformedController = TextEditingController(); @override void initState() { @@ -75,16 +73,11 @@ class _CreateSubWorkOrderPageState extends State { supplier: null, parentWOId: widget.workOrder.id, ); - _serviceReport = ServiceReport( - id: widget.workOrder.id, - assetType: widget.workOrder.assetType, - equipmentStatus: widget.workOrder.equipmentStatus); + _serviceReport = ServiceReport(id: widget.workOrder.id, assetType: widget.workOrder.assetType, equipmentStatus: widget.workOrder.equipmentStatus); _isLoading = true; super.initState(); if (context.mounted) { - Provider.of(context, - listen: false) - .reset(); + Provider.of(context, listen: false).reset(); } } @@ -93,18 +86,12 @@ class _CreateSubWorkOrderPageState extends State { Future getAssetType() async { Provider.of(context, listen: false).reset(); - final serviceRequestProvider = - Provider.of(context); - Provider.of(context, listen: false) - .reset(); - assetTypesProvider = - Provider.of(context, listen: false); - _callRequestForWorkOrder = - await serviceRequestProvider.getCallRequestForWorkOrder( - callId: widget.workOrder.callRequest.id.toString()); + final serviceRequestProvider = Provider.of(context); + Provider.of(context, listen: false).reset(); + assetTypesProvider = Provider.of(context, listen: false); + _callRequestForWorkOrder = await serviceRequestProvider.getCallRequestForWorkOrder(callId: widget.workOrder.callRequest.id.toString()); if (_subWorkOrders?.parentWOId != null) { - final subWoDetails = await serviceRequestProvider.getSubWorkOrderDetails( - parentId: _subWorkOrders?.parentWOId.toString()); + final subWoDetails = await serviceRequestProvider.getSubWorkOrderDetails(parentId: _subWorkOrders?.parentWOId.toString()); _subWorkOrders.copyDetails(subWoDetails); _serviceReport.equipmentStatus = subWoDetails.equipmentStatus; _serviceReport.reason = subWoDetails.reason; @@ -121,8 +108,7 @@ class _CreateSubWorkOrderPageState extends State { engineer = _subWorkOrders.suppEngineerWorkOrders?.last; engineer?.id = engineer?.supplierContactId; } - _subWorkOrders.supplier ??= - SupplierDetails(id: _subWorkOrders?.supplier?.id); + _subWorkOrders.supplier ??= SupplierDetails(id: _subWorkOrders?.supplier?.id); } setState(() { _isLoading = false; @@ -158,15 +144,10 @@ class _CreateSubWorkOrderPageState extends State { child: Column( crossAxisAlignment: CrossAxisAlignment.stretch, children: [ - (widget.workOrder?.callRequest?.asset?.site - ?.name ?? - "") - .heading5(context), + (widget.workOrder?.callRequest?.asset?.site?.name ?? "").heading5(context), 8.height, - "${context.translation.assetNo}: ${widget.workOrder?.callRequest?.asset?.assetNumber ?? ""}" - .bodyText(context), - "${context.translation.callId}: ${widget.workOrder?.callRequest?.id}" - .bodyText(context), + "${context.translation.assetNo}: ${widget.workOrder?.callRequest?.asset?.assetNumber ?? ""}".bodyText(context), + "${context.translation.callId}: ${widget.workOrder?.callRequest?.id}".bodyText(context), ], ).paddingAll(16), ), @@ -174,11 +155,9 @@ class _CreateSubWorkOrderPageState extends State { 8.height, ADatePicker( label: context.translation.returnToService, - date: DateTime.tryParse( - _subWorkOrders.visitDate ?? ""), + date: DateTime.tryParse(_subWorkOrders.visitDate ?? ""), onDatePicker: (date) { - _subWorkOrders.visitDate = - date?.toIso8601String(); + _subWorkOrders.visitDate = date?.toIso8601String(); setState(() {}); }, ), @@ -195,24 +174,19 @@ class _CreateSubWorkOrderPageState extends State { 8.height, LoadingManager( isLoading: assetTypesProvider.isLoading, - isFailedLoading: - assetTypesProvider.statuses == null, + isFailedLoading: assetTypesProvider.statuses == null, stateCode: assetTypesProvider.stateCode, onRefresh: () async { assetTypesProvider.reset(); await assetTypesProvider.getTypes(); - _serviceReport?.assetType = - assetTypesProvider.statuses?.firstWhere( - (element) => - element.value == - _serviceReport.callRequest.assetType, + _serviceReport?.assetType = assetTypesProvider.statuses?.firstWhere( + (element) => element.value == _serviceReport.callRequest.assetType, orElse: () => null, ); }, child: AppTextFormField( labelText: context.translation.assetType, - initialValue: - _serviceReport?.assetType?.name ?? "NULL", + initialValue: _serviceReport?.assetType?.name ?? "NULL", textAlign: TextAlign.center, enable: false, style: Theme.of(context).textTheme.titleMedium, @@ -228,8 +202,7 @@ class _CreateSubWorkOrderPageState extends State { }, ), 8.height, - SingleItemDropDownMenu( + SingleItemDropDownMenu( context: context, title: context.translation.equipmentStatus, initialValue: _subWorkOrders.equipmentStatus, @@ -245,15 +218,12 @@ class _CreateSubWorkOrderPageState extends State { onSelect: (status) { _serviceReport.calllastSituation = status; if (checkVendorFieldsVisibility(status)) { - _subWorkOrders.supplier ??= SupplierDetails( - id: _subWorkOrders?.supplier?.id); + _subWorkOrders.supplier ??= SupplierDetails(id: _subWorkOrders?.supplier?.id); engineer = null; } else { _subWorkOrders.supplier = initialSupplier; } - if (status?.value == 12 || - _subWorkOrders.calllastSituation?.value == - 12) { + if (status?.value == 12 || _subWorkOrders.calllastSituation?.value == 12) { _subWorkOrders.calllastSituation = status; _subWorkOrders.mrNumber = null; } else { @@ -262,8 +232,7 @@ class _CreateSubWorkOrderPageState extends State { setState(() {}); }, ), - if (_subWorkOrders.calllastSituation?.value == 12) - const SizedBox(height: 8), + if (_subWorkOrders.calllastSituation?.value == 12) const SizedBox(height: 8), if (_subWorkOrders.calllastSituation?.value == 12) AppTextFormField( labelText: context.translation.mrNumber, @@ -274,30 +243,24 @@ class _CreateSubWorkOrderPageState extends State { ), if (_showVendorFields) const SizedBox(height: 8), if (_showVendorFields) - SingleItemDropDownMenu( + SingleItemDropDownMenu( context: context, title: context.translation.vendorEng, initialValue: _subWorkOrders.supplier, onSelect: (supplier) { if (supplier != null) { _subWorkOrders.supplier = supplier; - log(_subWorkOrders.supplier?.suppPersons - ?.map((e) => e.personName) - ?.toString()); + log(_subWorkOrders.supplier?.suppPersons?.map((e) => e.personName)?.toString()); setState(() {}); } }, ), if (_showVendorFields) const SizedBox(height: 8), if (_showVendorFields) - SingleItemDropDownMenu( + SingleItemDropDownMenu( context: context, title: context.translation.vendorName, - enabled: _subWorkOrders - .supplier?.suppPersons?.isNotEmpty ?? - false, + enabled: _subWorkOrders.supplier?.suppPersons?.isNotEmpty ?? false, staticData: _subWorkOrders.supplier.suppPersons, onSelect: (suppPerson) { if (suppPerson != null) { @@ -306,8 +269,7 @@ class _CreateSubWorkOrderPageState extends State { supplierContactId: suppPerson?.id, personName: suppPerson?.personName, contact: suppPerson?.contact, - externalEngCode: - suppPerson?.externalEngCode, + externalEngCode: suppPerson?.externalEngCode, email: suppPerson?.email, ); } @@ -319,15 +281,13 @@ class _CreateSubWorkOrderPageState extends State { initialValue: _serviceReport.faultDescription, onSelect: (status) { _serviceReport.faultDescription = status; - _workPreformedController?.text = _serviceReport - .faultDescription?.workPerformed; + _workPreformedController?.text = _serviceReport.faultDescription?.workPerformed; }, ), 8.height, AppTextFormField( labelText: context.translation.solution, - initialValue: - _serviceReport?.faultDescription?.workPerformed, + initialValue: _serviceReport?.faultDescription?.workPerformed, textAlign: TextAlign.center, enable: false, controller: _workPreformedController, @@ -336,36 +296,20 @@ class _CreateSubWorkOrderPageState extends State { ServiceReportAssistantEmployeeMenu( title: context.translation.assignAssistant, assetId: widget.workOrder?.callRequest?.asset?.id, - initialValue: (_subWorkOrders - .assistantEmployees?.isNotEmpty ?? - false) - ? _subWorkOrders.assistantEmployees?.first - : null, + initialValue: (_subWorkOrders.assistantEmployees?.isNotEmpty ?? false) ? _subWorkOrders.assistantEmployees?.first : null, onSelect: (employee) { - _subWorkOrders.assistantEmployees = [ - employee.copyWith(id: 0) - ]; + _subWorkOrders.assistantEmployees = [employee.copyWith(id: 0)]; }, ), 8.height, - SingleItemDropDownMenu( + SingleItemDropDownMenu( context: context, title: context.translation.partNo, - staticData: _subWorkOrders.sparePartsWorkOrders - .map((e) => e.sparePart) - .toList(), - initialValue: (_subWorkOrders - .sparePartsWorkOrders?.isNotEmpty ?? - false) - ? _subWorkOrders - .sparePartsWorkOrders.first.sparePart - : null, + staticData: _subWorkOrders.sparePartsWorkOrders.map((e) => e.sparePart).toList(), + initialValue: (_subWorkOrders.sparePartsWorkOrders?.isNotEmpty ?? false) ? _subWorkOrders.sparePartsWorkOrders.first.sparePart : null, onSelect: (part) { _subWorkOrders.sparePartsWorkOrders.clear(); - _subWorkOrders.sparePartsWorkOrders.add( - SparePartsWorkOrders( - id: 0, sparePart: part, qty: 0)); + _subWorkOrders.sparePartsWorkOrders.add(SparePartsWorkOrders(id: 0, sparePart: part, qty: 0)); setState(() {}); }, ), @@ -373,20 +317,11 @@ class _CreateSubWorkOrderPageState extends State { AppTextFormField( labelText: context.translation.quantity, textInputType: TextInputType.number, - enable: _subWorkOrders - ?.sparePartsWorkOrders?.isNotEmpty, - initialValue: (_subWorkOrders - .sparePartsWorkOrders?.isNotEmpty ?? - false) - ? _subWorkOrders.sparePartsWorkOrders.first.qty - ?.toString() - : null, + enable: _subWorkOrders?.sparePartsWorkOrders?.isNotEmpty, + initialValue: (_subWorkOrders.sparePartsWorkOrders?.isNotEmpty ?? false) ? _subWorkOrders.sparePartsWorkOrders.first.qty?.toString() : null, onSaved: (text) { - if (_subWorkOrders - .sparePartsWorkOrders?.isNotEmpty ?? - false) { - _subWorkOrders.sparePartsWorkOrders.first.qty = - num.tryParse(text ?? ""); + if (_subWorkOrders.sparePartsWorkOrders?.isNotEmpty ?? false) { + _subWorkOrders.sparePartsWorkOrders.first.qty = num.tryParse(text ?? ""); } }, ), @@ -399,9 +334,7 @@ class _CreateSubWorkOrderPageState extends State { }, ), 8.height, - MultiFilesPicker( - label: context.translation.attachImage, - files: _files), + MultiFilesPicker(label: context.translation.attachImage, files: _files), AppTextFormField( labelText: context.translation.travelingExpense, initialValue: _serviceReport?.travelingExpenses?.toString(), @@ -438,47 +371,29 @@ class _CreateSubWorkOrderPageState extends State { onPressed: () async { setState(() {}); _subWorkOrders.suppEngineerWorkOrders ?? []; - if (engineer != null) - _subWorkOrders.suppEngineerWorkOrders - .add(engineer..id = 0); + if (engineer != null) _subWorkOrders.suppEngineerWorkOrders.add(engineer..id = 0); if (await validate()) { _subWorkOrders.attachmentsWorkOrder ??= []; for (var file in _files) { - _subWorkOrders.attachmentsWorkOrder.add(Attachment( - id: 0, - name: - "${file.path.split("/").last}|${base64Encode(file.readAsBytesSync())}")); + _subWorkOrders.attachmentsWorkOrder.add(Attachment(id: 0, name: "${file.path.split("/").last}|${base64Encode(file.readAsBytesSync())}")); } if (_formKey.currentState?.validate() ?? false) {} _formKey.currentState?.save(); - final serviceRequestsProvider = - Provider.of(context, - listen: false); - for (var element - in (_subWorkOrders?.suppEngineerWorkOrders ?? [])) { + final serviceRequestsProvider = Provider.of(context, listen: false); + for (var element in (_subWorkOrders?.suppEngineerWorkOrders ?? [])) { if (element != null) { element.id = 0; } } - showDialog( - context: context, - barrierDismissible: false, - builder: (context) => const AppLazyLoading()); - final status = await serviceRequestsProvider - .createSubWorkOrder(workOrder: _subWorkOrders); + showDialog(context: context, barrierDismissible: false, builder: (context) => const AppLazyLoading()); + final status = await serviceRequestsProvider.createSubWorkOrder(workOrder: _subWorkOrders); Navigator.of(context).pop(); if (status >= 200 && status < 300) { - Fluttertoast.showToast( - msg: - context.translation.successfulRequestMessage); + Fluttertoast.showToast(msg: context.translation.successfulRequestMessage); Navigator.of(context).pop(); } else { - String errorMessage = - HttpStatusManger.getStatusMessage( - status: serviceRequestsProvider.stateCode, - subtitle: context.translation); - ScaffoldMessenger.of(context).showSnackBar( - SnackBar(content: Text(errorMessage))); + String errorMessage = HttpStatusManger.getStatusMessage(status: serviceRequestsProvider.stateCode, subtitle: context.translation); + ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text(errorMessage))); } } }, @@ -490,16 +405,9 @@ class _CreateSubWorkOrderPageState extends State { } bool checkVendorFieldsVisibility(Lookup callsLastSituation) { - bool result = - (_subWorkOrders.supplier?.suppliername?.isNotEmpty ?? false) || - (callsLastSituation?.name - ?.toLowerCase() - ?.contains("under repair-vendor") ?? - false) || - (callsLastSituation?.name - ?.toLowerCase() - ?.contains("waiting for vendor") ?? - false); + bool result = (_subWorkOrders.supplier?.suppliername?.isNotEmpty ?? false) || + (callsLastSituation?.name?.toLowerCase()?.contains("under repair-vendor") ?? false) || + (callsLastSituation?.name?.toLowerCase()?.contains("waiting for vendor") ?? false); setState(() { _showVendorFields = result; }); @@ -508,39 +416,22 @@ class _CreateSubWorkOrderPageState extends State { Future validate() async { if (_subWorkOrders.reason == null) { - Fluttertoast.showToast( - msg: - "${context.translation.youHaveToSelect} ${context.translation.reason}"); + Fluttertoast.showToast(msg: "${context.translation.youHaveToSelect} ${context.translation.reason}"); return false; } else if (_subWorkOrders.equipmentStatus == null) { - Fluttertoast.showToast( - msg: - "${context.translation.youHaveToSelect} ${context.translation.equipmentStatus}"); + Fluttertoast.showToast(msg: "${context.translation.youHaveToSelect} ${context.translation.equipmentStatus}"); return false; } else if (_subWorkOrders.calllastSituation == null) { - Fluttertoast.showToast( - msg: - "${context.translation.youHaveToSelect} ${context.translation.callLastSituation}"); + Fluttertoast.showToast(msg: "${context.translation.youHaveToSelect} ${context.translation.callLastSituation}"); return false; - } else if (_showVendorFields && - _subWorkOrders.suppEngineerWorkOrders == null) { - Fluttertoast.showToast( - msg: - "${context.translation.youHaveToSelect} ${context.translation.vendorEng}"); + } else if (_showVendorFields && _subWorkOrders.suppEngineerWorkOrders == null) { + Fluttertoast.showToast(msg: "${context.translation.youHaveToSelect} ${context.translation.vendorEng}"); return false; - } else if (_showVendorFields && - (_subWorkOrders.supplier.suppliername == null || - _subWorkOrders.supplier.suppliername.isEmpty)) { - Fluttertoast.showToast( - msg: - "${context.translation.youHaveToSelect} ${context.translation.vendorName}"); + } else if (_showVendorFields && (_subWorkOrders.supplier.suppliername == null || _subWorkOrders.supplier.suppliername.isEmpty)) { + Fluttertoast.showToast(msg: "${context.translation.youHaveToSelect} ${context.translation.vendorName}"); return false; - } else if (_subWorkOrders.calllastSituation.value == 12 && - (_subWorkOrders.sparePartsWorkOrders == null || - _subWorkOrders.sparePartsWorkOrders.isEmpty)) { - Fluttertoast.showToast( - msg: - "${context.translation.youHaveToSelect} ${context.translation.partNo}"); + } else if (_subWorkOrders.calllastSituation.value == 12 && (_subWorkOrders.sparePartsWorkOrders == null || _subWorkOrders.sparePartsWorkOrders.isEmpty)) { + Fluttertoast.showToast(msg: "${context.translation.youHaveToSelect} ${context.translation.partNo}"); return false; } else if (_subWorkOrders?.timer?.startAt == null) { await Fluttertoast.showToast(msg: "Working Hours Required"); diff --git a/lib/views/pages/sub_workorder/workorder_list.dart b/lib/views/pages/sub_workorder/workorder_list.dart index b6a84691..b6855823 100644 --- a/lib/views/pages/sub_workorder/workorder_list.dart +++ b/lib/views/pages/sub_workorder/workorder_list.dart @@ -1,14 +1,10 @@ -import 'dart:developer'; - import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; import 'package:test_sa/extensions/context_extension.dart'; import 'package:test_sa/views/pages/sub_workorder/workorder_item.dart'; -import '../../../controllers/localization/localization.dart'; import '../../../controllers/providers/api/service_requests_provider.dart'; import '../../../models/service_request/search_work_order.dart'; -import '../../../models/subtitle.dart'; import '../../app_style/colors.dart'; import '../../widgets/buttons/app_back_button.dart'; import '../../widgets/loaders/lazy_loading.dart'; diff --git a/lib/views/pages/sub_workorder/workorder_update.dart b/lib/views/pages/sub_workorder/workorder_update.dart index d9442399..0b925248 100644 --- a/lib/views/pages/sub_workorder/workorder_update.dart +++ b/lib/views/pages/sub_workorder/workorder_update.dart @@ -1,9 +1,7 @@ import 'package:flutter/material.dart'; import 'package:test_sa/views/pages/sub_workorder/workorder_details.dart'; -import '../../../controllers/localization/localization.dart'; import '../../../models/service_request/search_work_order.dart'; -import '../../../models/subtitle.dart'; import '../../app_style/colors.dart'; import '../../widgets/buttons/app_back_button.dart'; import '../../widgets/loaders/loading_manager.dart'; @@ -24,7 +22,6 @@ class _WorkOrderUpdateState extends State { @override Widget build(BuildContext context) { - return Scaffold( body: SafeArea( child: Form( diff --git a/lib/views/pages/user/gas_refill/gas_refill_details.dart b/lib/views/pages/user/gas_refill/gas_refill_details.dart index 659ac120..7cc1e788 100644 --- a/lib/views/pages/user/gas_refill/gas_refill_details.dart +++ b/lib/views/pages/user/gas_refill/gas_refill_details.dart @@ -117,7 +117,7 @@ class _GasRefillDetailsPageState extends State { crossAxisAlignment: CrossAxisAlignment.end, children: [ if (_userProvider.user.type == UsersTypes.engineer && (gasRefillModel.status?.value ?? 0) != 2) - "edit".toSvgAsset(height: 48,width: 48).onPress( + "edit".toSvgAsset(height: 48, width: 48).onPress( () async { _model?.fromGasRefillModel(gasRefillModel); // setState(() {}); diff --git a/lib/views/pages/user/gas_refill/request_gas_refill.dart b/lib/views/pages/user/gas_refill/request_gas_refill.dart index a169cdb1..740c8df0 100644 --- a/lib/views/pages/user/gas_refill/request_gas_refill.dart +++ b/lib/views/pages/user/gas_refill/request_gas_refill.dart @@ -1,5 +1,4 @@ import 'dart:convert'; -import 'dart:developer'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; @@ -44,7 +43,6 @@ class _RequestGasRefillState extends State { Uint8List _engineerSignature; Uint8List _nurseSignature; - UserProvider _userProvider; SettingProvider _settingProvider; GasRefillProvider _gasRefillProvider; @@ -133,7 +131,7 @@ class _RequestGasRefillState extends State { setState(() {}); return false; } - _formModel.gazRefillDetails[0].deliverdQty = _currentDetails.deliverdQty; + _formModel.gazRefillDetails[0].deliverdQty = _currentDetails.deliverdQty; _validate = false; // Scrollable.ensureVisible(_DetailsKey.currentContext); _deliveredQuantityController.clear(); @@ -262,7 +260,7 @@ class _RequestGasRefillState extends State { _engineerSignature = signature; if (signature == null || signature.isEmpty) return; _formModel.engSignature = "${DateTime.now().toIso8601String()}.png|${base64Encode(signature)}"; - base64Encode(signature); + base64Encode(signature); }, ), 8.height, @@ -273,8 +271,8 @@ class _RequestGasRefillState extends State { onSaved: (signature) { _nurseSignature = signature; if (signature == null || signature.isEmpty) return; - _formModel.nurseSignature = "${DateTime.now().toIso8601String()}.png|${base64Encode(signature)}"; - base64Encode(signature); + _formModel.nurseSignature = "${DateTime.now().toIso8601String()}.png|${base64Encode(signature)}"; + base64Encode(signature); }, ), ], diff --git a/lib/views/pages/user/gas_refill/track_gas_refill.dart b/lib/views/pages/user/gas_refill/track_gas_refill.dart index 3a7ba6d5..2056e8dd 100644 --- a/lib/views/pages/user/gas_refill/track_gas_refill.dart +++ b/lib/views/pages/user/gas_refill/track_gas_refill.dart @@ -4,8 +4,6 @@ import 'package:test_sa/controllers/providers/api/gas_refill_provider.dart'; import 'package:test_sa/controllers/providers/api/user_provider.dart'; import 'package:test_sa/controllers/providers/settings/setting_provider.dart'; import 'package:test_sa/extensions/context_extension.dart'; - - import 'package:test_sa/views/widgets/gas_refill/gas_refill_list.dart'; import 'package:test_sa/views/widgets/loaders/loading_manager.dart'; diff --git a/lib/views/pages/user/land_page.dart b/lib/views/pages/user/land_page.dart index 4185df62..f6cba680 100644 --- a/lib/views/pages/user/land_page.dart +++ b/lib/views/pages/user/land_page.dart @@ -3,27 +3,18 @@ import 'dart:io'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; -import 'package:package_info/package_info.dart'; import 'package:provider/provider.dart'; -import 'package:share/share.dart'; import 'package:test_sa/controllers/notification/firebase_notification_manger.dart'; import 'package:test_sa/controllers/providers/api/user_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/widget_extensions.dart'; import 'package:test_sa/new_views/pages/new_gas_refill_request_page.dart'; -import 'package:test_sa/views/app_style/colors.dart'; import 'package:test_sa/views/app_style/sizing.dart'; import 'package:test_sa/views/pages/device_transfer/track_device_transfer.dart'; import 'package:test_sa/views/pages/user/gas_refill/track_gas_refill.dart'; import 'package:test_sa/views/pages/user/requests/create_service_request_page.dart'; import 'package:test_sa/views/pages/user/visits/regular_visits_page.dart'; -import 'package:test_sa/views/widgets/buttons/app_back_button.dart'; -import 'package:test_sa/views/widgets/buttons/app_icon_button.dart'; import 'package:test_sa/views/widgets/dialogs/dialog.dart'; -import 'package:test_sa/views/widgets/drawer/drawer_item.dart'; -import 'package:url_launcher/url_launcher.dart'; import '../../../models/enums/user_types.dart'; import '../../widgets/land_page/land_page_item.dart'; @@ -45,10 +36,12 @@ class _LandPageState extends State { double _width; UserProvider _userProvider; SettingProvider _settingProvider; + // DepartmentsProvider _departmentsProvider; // DevicesProvider _devicesProvider; double _buttonHeight; bool firstTime = true; + // ServiceRequestsProvider _serviceRequestsProvider; // PreventiveMaintenanceVisitsProvider _preventiveMaintenanceVisitsProvider; // RegularVisitsProvider _regularVisitsProvider; @@ -88,7 +81,7 @@ class _LandPageState extends State { onWillPop: () async { bool result = await showDialog( context: context, - builder: (_) => AAlertDialog( + builder: (_) => AAlertDialog( // title: _subtitle.exit, title: context.translation.exit, // content: _subtitle.exitAlert, diff --git a/lib/views/pages/user/profile_page.dart b/lib/views/pages/user/profile_page.dart index dcc51e86..fd6f7f7e 100644 --- a/lib/views/pages/user/profile_page.dart +++ b/lib/views/pages/user/profile_page.dart @@ -1,7 +1,5 @@ -import 'dart:convert'; import 'dart:io'; -import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:image_cropper/image_cropper.dart'; import 'package:image_picker/image_picker.dart'; @@ -14,7 +12,6 @@ import 'package:test_sa/extensions/text_extensions.dart'; import 'package:test_sa/extensions/widget_extensions.dart'; import 'package:test_sa/models/user.dart'; import 'package:test_sa/new_views/common_widgets/default_app_bar.dart'; -import 'package:test_sa/views/widgets/loaders/loading_manager.dart'; import '../../../new_views/app_style/app_color.dart'; @@ -71,11 +68,11 @@ class _ProfilePageState extends State { child: Padding( padding: const EdgeInsets.all(1), // Border radius child: ClipOval( - child: snapshot.profileImage != null - ? Image.file(snapshot.profileImage) - : (snapshot.user.profilePhotoName?.isNotEmpty ?? false) - ? Image.network(snapshot.user.profilePhotoName) - : const Icon( + child: snapshot.profileImage != null + ? Image.file(snapshot.profileImage) + : (snapshot.user.profilePhotoName?.isNotEmpty ?? false) + ? Image.network(snapshot.user.profilePhotoName) + : const Icon( Icons.person, size: 50, color: Colors.white, diff --git a/lib/views/pages/user/report_issues_page.dart b/lib/views/pages/user/report_issues_page.dart index 55bbd2bd..0cc90c50 100644 --- a/lib/views/pages/user/report_issues_page.dart +++ b/lib/views/pages/user/report_issues_page.dart @@ -1,7 +1,6 @@ import 'package:flutter/material.dart'; import 'package:fluttertoast/fluttertoast.dart'; import 'package:provider/provider.dart'; -import 'package:test_sa/controllers/localization/localization.dart'; import 'package:test_sa/controllers/providers/api/service_requests_provider.dart'; import 'package:test_sa/controllers/providers/api/user_provider.dart'; import 'package:test_sa/controllers/providers/settings/setting_provider.dart'; @@ -9,7 +8,6 @@ import 'package:test_sa/controllers/validator/validator.dart'; import 'package:test_sa/extensions/context_extension.dart'; import 'package:test_sa/models/issue.dart'; import 'package:test_sa/models/service_request/service_request.dart'; -import 'package:test_sa/models/subtitle.dart'; import 'package:test_sa/views/app_style/colors.dart'; import 'package:test_sa/views/app_style/sizing.dart'; import 'package:test_sa/views/widgets/app_text_form_field.dart'; diff --git a/lib/views/pages/user/requests/first_action_bottom_sheet.dart b/lib/views/pages/user/requests/first_action_bottom_sheet.dart index f8346092..3fcf0190 100644 --- a/lib/views/pages/user/requests/first_action_bottom_sheet.dart +++ b/lib/views/pages/user/requests/first_action_bottom_sheet.dart @@ -21,6 +21,7 @@ import '../../../widgets/date_and_time/date_picker.dart'; class FirstActionBottomSheet extends StatefulWidget { final ServiceRequest request; + const FirstActionBottomSheet({Key key, @required this.request}) : super(key: key); @override @@ -31,6 +32,7 @@ class _FirstActionBottomSheetState extends State { ServiceRequest _serviceRequest; Asset asset; final GlobalKey _formKey = GlobalKey(); + @override void initState() { super.initState(); diff --git a/lib/views/pages/user/requests/future_request_service_details.dart b/lib/views/pages/user/requests/future_request_service_details.dart index e773c8b5..8ec71c3f 100644 --- a/lib/views/pages/user/requests/future_request_service_details.dart +++ b/lib/views/pages/user/requests/future_request_service_details.dart @@ -1,12 +1,10 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import 'package:test_sa/controllers/localization/localization.dart'; import 'package:test_sa/controllers/providers/api/service_requests_provider.dart'; import 'package:test_sa/controllers/providers/api/user_provider.dart'; import 'package:test_sa/controllers/providers/settings/setting_provider.dart'; import 'package:test_sa/extensions/context_extension.dart'; import 'package:test_sa/models/service_request/service_request.dart'; -import 'package:test_sa/models/subtitle.dart'; import 'package:test_sa/views/pages/user/requests/service_request_details.dart'; import 'package:test_sa/views/widgets/loaders/app_loading.dart'; import 'package:test_sa/views/widgets/loaders/failed_loading.dart'; diff --git a/lib/views/pages/user/requests/requests_page.dart b/lib/views/pages/user/requests/requests_page.dart index 923d0626..bb69111a 100644 --- a/lib/views/pages/user/requests/requests_page.dart +++ b/lib/views/pages/user/requests/requests_page.dart @@ -1,21 +1,12 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import 'package:test_sa/controllers/localization/localization.dart'; import 'package:test_sa/controllers/providers/api/service_requests_provider.dart'; import 'package:test_sa/controllers/providers/api/user_provider.dart'; import 'package:test_sa/controllers/providers/settings/setting_provider.dart'; import 'package:test_sa/extensions/context_extension.dart'; -import 'package:test_sa/models/enums/translation_keys.dart'; -import 'package:test_sa/models/service_request/service_request_search.dart'; -import 'package:test_sa/models/subtitle.dart'; import 'package:test_sa/new_views/common_widgets/default_app_bar.dart'; -import 'package:test_sa/views/app_style/colors.dart'; -import 'package:test_sa/views/widgets/buttons/app_back_button.dart'; -import 'package:test_sa/views/widgets/buttons/app_icon_button.dart'; import 'package:test_sa/views/widgets/loaders/loading_manager.dart'; import 'package:test_sa/views/widgets/requests/service_request_list.dart'; -import 'package:test_sa/views/widgets/search/service_request_search_bar.dart'; -import 'package:flutter_gen/gen_l10n/app_localizations.dart'; class ServiceRequestsPage extends StatefulWidget { static final String id = "/service-requests"; diff --git a/lib/views/pages/user/requests/update_service_request_page.dart b/lib/views/pages/user/requests/update_service_request_page.dart index d7e7a395..8fdd3232 100644 --- a/lib/views/pages/user/requests/update_service_request_page.dart +++ b/lib/views/pages/user/requests/update_service_request_page.dart @@ -29,6 +29,7 @@ import '../../../widgets/sound/record_sound.dart'; class UpdateServiceRequestPage extends StatefulWidget { static const String id = "/update_service_request_page"; final ServiceRequest serviceRequest; + const UpdateServiceRequestPage({Key key, this.serviceRequest}) : super(key: key); @override diff --git a/lib/views/pages/user/requests/work_order/create_service_report.dart b/lib/views/pages/user/requests/work_order/create_service_report.dart index bea0e287..cb0406a4 100644 --- a/lib/views/pages/user/requests/work_order/create_service_report.dart +++ b/lib/views/pages/user/requests/work_order/create_service_report.dart @@ -1,5 +1,4 @@ import 'dart:convert'; -import 'dart:developer'; import 'dart:io'; import 'package:flutter/material.dart'; @@ -7,7 +6,6 @@ import 'package:provider/provider.dart'; import 'package:test_sa/attachment.dart'; import 'package:test_sa/controllers/providers/api/parts_provider.dart'; import 'package:test_sa/controllers/providers/api/service_requests_provider.dart'; -import 'package:test_sa/controllers/providers/api/status_drop_down/report/service_report_fault_description_provider.dart'; import 'package:test_sa/controllers/providers/api/user_provider.dart'; import 'package:test_sa/controllers/providers/settings/setting_provider.dart'; import 'package:test_sa/extensions/context_extension.dart'; @@ -33,7 +31,6 @@ import '../../../../../models/service_request/spare_parts.dart'; import '../../../../../new_views/common_widgets/app_text_form_field.dart'; import '../../../../../new_views/common_widgets/default_app_bar.dart'; import '../../../../../new_views/common_widgets/single_item_drop_down_menu.dart'; -import '../../../../../providers/work_order/asset_types_provider.dart'; import '../../../../widgets/date_and_time/date_picker.dart'; import '../../../../widgets/images/multi_image_picker.dart'; import '../../../../widgets/status/report/service_report_fault_description.dart'; @@ -170,7 +167,7 @@ class _CreateServiceReportState extends State with TickerPr _assetTypeProvider.reset(); await _assetTypeProvider.getTypes(user: _userProvider.user, host: _settingProvider.host); _serviceReport?.assetType = _assetTypeProvider.statuses?.firstWhere( - (element) => element.value == _serviceReport.callRequest.assetType, + (element) => element.value == _serviceReport.callRequest.assetType, orElse: () => null, ); }, @@ -227,7 +224,7 @@ class _CreateServiceReportState extends State with TickerPr 8.height, AppTextFormField( labelText: context.translation.solution, - initialValue: _serviceReport?.faultDescription?.workPerformed, + initialValue: _serviceReport?.faultDescription?.workPerformed, textAlign: TextAlign.center, enable: false, controller: _workPreformedController, @@ -308,7 +305,8 @@ class _CreateServiceReportState extends State with TickerPr _serviceReport.localEngSignature = signature; _serviceReport.engSignature = signature != null ? "${DateTime.now().toIso8601String()}.png|${base64Encode(signature)}" : null; }, - ), 8.height, + ), + 8.height, ESignature( title: context.translation.nurseSignature, oldSignature: _serviceReport.nurseSignature, diff --git a/lib/views/pages/user/requests/work_order/edit_service_report.dart b/lib/views/pages/user/requests/work_order/edit_service_report.dart index 97f2e9c0..73b85d8f 100644 --- a/lib/views/pages/user/requests/work_order/edit_service_report.dart +++ b/lib/views/pages/user/requests/work_order/edit_service_report.dart @@ -152,7 +152,7 @@ class _EditServiceReportState extends State with TickerProvid _assetTypeProvider.reset(); await _assetTypeProvider.getTypes(user: _userProvider.user, host: _settingProvider.host); _serviceReport?.assetType = _assetTypeProvider.statuses?.firstWhere( - (element) => element.value == _serviceReport.callRequest.assetType, + (element) => element.value == _serviceReport.callRequest.assetType, orElse: () => null, ); }, @@ -209,7 +209,7 @@ class _EditServiceReportState extends State with TickerProvid 8.height, AppTextFormField( labelText: context.translation.solution, - initialValue: _serviceReport?.faultDescription?.workPerformed, + initialValue: _serviceReport?.faultDescription?.workPerformed, textAlign: TextAlign.center, enable: false, controller: _workPreformedController, diff --git a/lib/views/pages/user/requests/work_order/work_order_details_page.dart b/lib/views/pages/user/requests/work_order/work_order_details_page.dart index c1dfbca1..727ce5f4 100644 --- a/lib/views/pages/user/requests/work_order/work_order_details_page.dart +++ b/lib/views/pages/user/requests/work_order/work_order_details_page.dart @@ -21,6 +21,7 @@ class WorkOrderDetailsPage extends StatelessWidget { static const String id = "/work_order_details_page"; final SearchWorkOrder workOrder; final ServiceRequest serviceRequest; + const WorkOrderDetailsPage({Key key, this.workOrder, this.serviceRequest}) : super(key: key); @override diff --git a/lib/views/pages/user/visits/pantry/edit_pentry.dart b/lib/views/pages/user/visits/pantry/edit_pentry.dart index 013cc5f0..63706889 100644 --- a/lib/views/pages/user/visits/pantry/edit_pentry.dart +++ b/lib/views/pages/user/visits/pantry/edit_pentry.dart @@ -87,12 +87,12 @@ class _EditPentryState extends State with SingleTickerProviderStateM child: Column( children: [ Container( - decoration: BoxDecoration(color: context.isDark?AppColor.neutral10 : AppColor.neutral30, borderRadius: BorderRadius.circular(16)), + decoration: BoxDecoration(color: context.isDark ? AppColor.neutral10 : AppColor.neutral30, borderRadius: BorderRadius.circular(16)), child: TabBar( controller: _tabController, isScrollable: true, padding: EdgeInsets.zero, - labelColor: context.isDark? AppColor.neutral10 :AppColor.neutral60, + labelColor: context.isDark ? AppColor.neutral10 : AppColor.neutral60, unselectedLabelColor: AppColor.neutral20, indicatorPadding: const EdgeInsets.all(4), indicator: BoxDecoration(color: Theme.of(context).cardColor, borderRadius: BorderRadius.circular(13)), diff --git a/lib/views/pages/user/visits/pantry/future_edit_pently.dart b/lib/views/pages/user/visits/pantry/future_edit_pently.dart index 8343904c..de91fe60 100644 --- a/lib/views/pages/user/visits/pantry/future_edit_pently.dart +++ b/lib/views/pages/user/visits/pantry/future_edit_pently.dart @@ -22,6 +22,7 @@ class FutureEditPentry extends StatefulWidget { class _FutureEditPentryState extends State { UserProvider _userProvider; SettingProvider _settingProvider; + @override Widget build(BuildContext context) { _userProvider = Provider.of(context); diff --git a/lib/views/pages/user/visits/preventive_maintenance_visits_page.dart b/lib/views/pages/user/visits/preventive_maintenance_visits_page.dart index b45c3de8..0281588c 100644 --- a/lib/views/pages/user/visits/preventive_maintenance_visits_page.dart +++ b/lib/views/pages/user/visits/preventive_maintenance_visits_page.dart @@ -3,12 +3,10 @@ import 'package:flutter/material.dart'; import 'package:fluttertoast/fluttertoast.dart'; import 'package:provider/provider.dart'; import 'package:test_sa/controllers/api_routes/http_status_manger.dart'; -import 'package:test_sa/controllers/localization/localization.dart'; import 'package:test_sa/controllers/providers/api/preventive_maintenance_visits_provider.dart'; import 'package:test_sa/controllers/providers/api/user_provider.dart'; import 'package:test_sa/controllers/providers/settings/setting_provider.dart'; import 'package:test_sa/extensions/context_extension.dart'; -import 'package:test_sa/models/subtitle.dart'; import 'package:test_sa/models/visits/visits_group.dart'; import 'package:test_sa/models/visits/visits_search.dart'; import 'package:test_sa/views/app_style/colors.dart'; diff --git a/lib/views/pages/user/visits/update_visits_group_sheet.dart b/lib/views/pages/user/visits/update_visits_group_sheet.dart index 359859d7..26c0bed7 100644 --- a/lib/views/pages/user/visits/update_visits_group_sheet.dart +++ b/lib/views/pages/user/visits/update_visits_group_sheet.dart @@ -1,7 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:test_sa/controllers/localization/localization.dart'; import 'package:test_sa/extensions/context_extension.dart'; -import 'package:test_sa/models/subtitle.dart'; import 'package:test_sa/models/visits/visit.dart'; import 'package:test_sa/models/visits/visits_group.dart'; import 'package:test_sa/views/app_style/colors.dart'; @@ -36,7 +34,6 @@ class _UpdateVisitsGroupSheetState extends State { // File _image; - @override void initState() { super.initState(); @@ -46,7 +43,6 @@ class _UpdateVisitsGroupSheetState extends State { @override Widget build(BuildContext context) { - return Container( height: MediaQuery.of(context).size.height / 1.3, padding: EdgeInsets.symmetric( diff --git a/lib/views/widgets/date_and_time/from_to_date_bar.dart b/lib/views/widgets/date_and_time/from_to_date_bar.dart index e846699c..cc0f3fd6 100644 --- a/lib/views/widgets/date_and_time/from_to_date_bar.dart +++ b/lib/views/widgets/date_and_time/from_to_date_bar.dart @@ -1,7 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:test_sa/controllers/localization/localization.dart'; import 'package:test_sa/extensions/context_extension.dart'; -import 'package:test_sa/models/subtitle.dart'; import 'package:test_sa/views/app_style/sizing.dart'; import 'date_picker.dart'; @@ -31,7 +29,6 @@ class _FromToDateBarState extends State { @override Widget build(BuildContext context) { - return Row( mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: [ diff --git a/lib/views/widgets/date_and_time/time_picker.dart b/lib/views/widgets/date_and_time/time_picker.dart index ea079428..3d06a01c 100644 --- a/lib/views/widgets/date_and_time/time_picker.dart +++ b/lib/views/widgets/date_and_time/time_picker.dart @@ -8,7 +8,6 @@ class ADateTimePicker extends StatelessWidget { final Function(DateTime) onDateTimePicker; final bool enable; - const ADateTimePicker({Key key, this.date, this.onDateTimePicker, this.from, this.to, this.enable}) : super(key: key); @override @@ -25,10 +24,12 @@ class ADateTimePicker extends StatelessWidget { date == null ? "Pick Time" : date.toString().substring(0, date.toString().lastIndexOf(":")), textScaleFactor: AppStyle.getScaleFactor(context), ), - onPressed: enable? () async { - // TimeOfDay picked = await showTimePicker(context: context, initialTime: TimeOfDay.now()); - onDateTimePicker(await showDateTimePicker(context: context, initialDate: date, firstDate: from, lastDate: to)); - }: null, + onPressed: enable + ? () async { + // TimeOfDay picked = await showTimePicker(context: context, initialTime: TimeOfDay.now()); + onDateTimePicker(await showDateTimePicker(context: context, initialDate: date, firstDate: from, lastDate: to)); + } + : null, ); } } diff --git a/lib/views/widgets/departments/department_button.dart b/lib/views/widgets/departments/department_button.dart index 6ab0106d..8742cd59 100644 --- a/lib/views/widgets/departments/department_button.dart +++ b/lib/views/widgets/departments/department_button.dart @@ -1,8 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:test_sa/controllers/localization/localization.dart'; import 'package:test_sa/extensions/context_extension.dart'; import 'package:test_sa/models/department.dart'; -import 'package:test_sa/models/subtitle.dart'; import 'package:test_sa/views/app_style/colors.dart'; import 'package:test_sa/views/app_style/sizing.dart'; import 'package:test_sa/views/widgets/departments/single_department_picker.dart'; @@ -15,7 +13,6 @@ class DepartmentButton extends StatelessWidget { @override Widget build(BuildContext context) { - return ElevatedButton( style: ElevatedButton.styleFrom( elevation: 0, diff --git a/lib/views/widgets/departments/single_department_picker.dart b/lib/views/widgets/departments/single_department_picker.dart index a9c3500e..f9c83959 100644 --- a/lib/views/widgets/departments/single_department_picker.dart +++ b/lib/views/widgets/departments/single_department_picker.dart @@ -1,11 +1,9 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import 'package:test_sa/controllers/localization/localization.dart'; import 'package:test_sa/controllers/providers/api/departments_provider.dart'; import 'package:test_sa/controllers/providers/settings/setting_provider.dart'; import 'package:test_sa/extensions/context_extension.dart'; import 'package:test_sa/models/department.dart'; -import 'package:test_sa/models/subtitle.dart'; import 'package:test_sa/views/widgets/departments/department_item.dart'; import 'package:test_sa/views/widgets/loaders/loading_manager.dart'; import 'package:test_sa/views/widgets/loaders/no_item_found.dart'; diff --git a/lib/views/widgets/device_trancfer/device_transfer_info_section.dart b/lib/views/widgets/device_trancfer/device_transfer_info_section.dart index d3c562aa..2d023bc5 100644 --- a/lib/views/widgets/device_trancfer/device_transfer_info_section.dart +++ b/lib/views/widgets/device_trancfer/device_transfer_info_section.dart @@ -14,6 +14,7 @@ class DeviceTransferInfoSection extends StatelessWidget { final DeviceTransferInfo info; final bool isSender; final VoidCallback onEdit; + const DeviceTransferInfoSection({Key key, this.info, this.onEdit, this.isSender}) : super(key: key); @override diff --git a/lib/views/widgets/device_trancfer/device_transfer_item.dart b/lib/views/widgets/device_trancfer/device_transfer_item.dart index 6785910c..695fc255 100644 --- a/lib/views/widgets/device_trancfer/device_transfer_item.dart +++ b/lib/views/widgets/device_trancfer/device_transfer_item.dart @@ -24,9 +24,8 @@ class DeviceTransferItem extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.stretch, children: [ context.translation.deviceTransferRequest.heading5(context), - - '${context.translation.from} : ${item.senderAssignedEmployeeName}'.bodyText(context), - '${context.translation.to} : ${item.receiverAssignedEmployeeName}'.bodyText(context), + '${context.translation.from} : ${item.senderAssignedEmployeeName}'.bodyText(context), + '${context.translation.to} : ${item.receiverAssignedEmployeeName}'.bodyText(context), 8.height, Row( mainAxisSize: MainAxisSize.min, @@ -59,7 +58,8 @@ class DeviceTransferItem extends StatelessWidget { /// TBD //StatusLabel(label: '', textColor: AColors.getRequestStatusTextColor(0), backgroundColor: AColors.getRequestStatusColor(0)), 1.width, - Text(item.createdOn != null ? item.createdOn.toServiceRequestCardFormat : "", textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: context.isDark? AppColor.neutral10 : const Color(0xFF3B3D4A))), + Text(item.createdOn != null ? item.createdOn.toServiceRequestCardFormat : "", + textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: context.isDark ? AppColor.neutral10 : const Color(0xFF3B3D4A))), ], ), ], diff --git a/lib/views/widgets/device_trancfer/device_transfer_list.dart b/lib/views/widgets/device_trancfer/device_transfer_list.dart index e9527ff0..bcc6a3c2 100644 --- a/lib/views/widgets/device_trancfer/device_transfer_list.dart +++ b/lib/views/widgets/device_trancfer/device_transfer_list.dart @@ -1,8 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:test_sa/controllers/localization/localization.dart'; -import 'package:test_sa/models/device/asset_transfer.dart'; -import 'package:test_sa/models/subtitle.dart'; import 'package:test_sa/extensions/context_extension.dart'; +import 'package:test_sa/models/device/asset_transfer.dart'; import 'package:test_sa/views/pages/device_transfer/device_transfer_details.dart'; import 'package:test_sa/views/widgets/device_trancfer/device_transfer_item.dart'; import 'package:test_sa/views/widgets/loaders/lazy_loading.dart'; diff --git a/lib/views/widgets/dialogs/dialog.dart b/lib/views/widgets/dialogs/dialog.dart index 4be996e1..0832ca24 100644 --- a/lib/views/widgets/dialogs/dialog.dart +++ b/lib/views/widgets/dialogs/dialog.dart @@ -10,7 +10,7 @@ class AAlertDialog extends StatelessWidget { @override Widget build(BuildContext context) { - // + // return CupertinoAlertDialog( title: title != null ? Text(title) : null, content: content != null ? Text(content) : null, diff --git a/lib/views/widgets/equipment/asset_detail_page.dart b/lib/views/widgets/equipment/asset_detail_page.dart index e1219f1c..b488e213 100644 --- a/lib/views/widgets/equipment/asset_detail_page.dart +++ b/lib/views/widgets/equipment/asset_detail_page.dart @@ -10,8 +10,6 @@ import 'package:test_sa/models/device/asset_by_id_model.dart'; import 'package:test_sa/new_views/common_widgets/default_app_bar.dart'; import 'package:test_sa/views/widgets/loaders/app_loading.dart'; import 'package:test_sa/views/widgets/loaders/failed_loading.dart'; -import 'package:test_sa/views/widgets/loaders/lazy_loading.dart'; -import 'package:test_sa/views/widgets/loaders/loading_manager.dart'; import '../../../new_views/app_style/app_color.dart'; @@ -93,32 +91,32 @@ class _AssetDetailPageState extends State { _assetProvider.assetById?.modelDefinition?.assetName ?? "-".heading5(context), ), 8.height, - "${context.translation.assetNumber}: ${_assetProvider.assetById.multiAssets.first.assetNumber}".bodyText(context), - "${context.translation.model}: ${_assetProvider.assetById.modelDefinition.modelDefCode}".bodyText(context), + "${context.translation.assetNumber}: ${_assetProvider.assetById.multiAssets.first.assetNumber}".bodyText(context), + "${context.translation.model}: ${_assetProvider.assetById.modelDefinition.modelDefCode}".bodyText(context), Text( "${context.translation.serialNo}: ${_assetProvider.assetById.multiAssets.first.assetSerialNo}", maxLines: 2, - style: AppTextStyles.bodyText.copyWith(color: context.isDark? AppColor.neutral10:Color(0xFF757575)), + style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : Color(0xFF757575)), ), Text( "MD: ${_assetProvider.assetById.department.departmentName ?? "-"}", maxLines: 2, - style: AppTextStyles.bodyText.copyWith(color: context.isDark? AppColor.neutral10: Color(0xFF757575)), + style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : Color(0xFF757575)), ), Text( "Supplier: ${_assetProvider.assetById.supplier?.suppliername ?? "-"}", maxLines: 2, - style: AppTextStyles.bodyText.copyWith(color: context.isDark? AppColor.neutral10: Color(0xFF757575)), + style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : Color(0xFF757575)), ), Text( "Manufacturer: ${_assetProvider.assetById.modelDefinition.manufacturerName}", maxLines: 2, - style: AppTextStyles.bodyText.copyWith(color: context.isDark? AppColor.neutral10: Color(0xFF757575)), + style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : Color(0xFF757575)), ), Text( "Location: ${_assetProvider.assetById.site.custName}", maxLines: 2, - style: AppTextStyles.bodyText.copyWith(color: context.isDark? AppColor.neutral10: Color(0xFF757575)), + style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : Color(0xFF757575)), ), 8.height, const Divider(color: Color(0xFFEAF1F4), height: 1, thickness: 1), @@ -126,17 +124,17 @@ class _AssetDetailPageState extends State { Text( "Installation Date: ${_assetProvider.assetById.installationDate ?? "-"}", maxLines: 2, - style: AppTextStyles.bodyText.copyWith(color: context.isDark? AppColor.neutral10: Color(0xFF757575)), + style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : Color(0xFF757575)), ), Text( "Next PM Date: ${_assetProvider.assetById.installationDate ?? "-"}", maxLines: 2, - style: AppTextStyles.bodyText.copyWith(color: context.isDark? AppColor.neutral10: Color(0xFF757575)), + style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : Color(0xFF757575)), ), Text( "Last PM Date: ${_assetProvider.assetById.installationDate ?? "-"}", maxLines: 2, - style: AppTextStyles.bodyText.copyWith(color: context.isDark? AppColor.neutral10: Color(0xFF757575)), + style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : Color(0xFF757575)), ), if ((_assetProvider.assetById.modelDefinition.assetDescription ?? "").isNotEmpty) ...[ 8.height, @@ -145,7 +143,7 @@ class _AssetDetailPageState extends State { Text( _assetProvider.assetById.modelDefinition.assetDescription ?? "-", maxLines: 2, - style: AppTextStyles.bodyText.copyWith(color: context.isDark? AppColor.neutral10: Color(0xFF757575)), + style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : Color(0xFF757575)), ), ] ], diff --git a/lib/views/widgets/equipment/asset_item_gridview.dart b/lib/views/widgets/equipment/asset_item_gridview.dart index ee3cca65..355a6de5 100644 --- a/lib/views/widgets/equipment/asset_item_gridview.dart +++ b/lib/views/widgets/equipment/asset_item_gridview.dart @@ -41,20 +41,20 @@ class AssetItemGridView extends StatelessWidget { Text( device.modelDefinition.assetName, maxLines: 2, - style: AppTextStyles.bodyText.copyWith(color: context.isDark? AppColor.neutral30: Color(0xFF3B3D4A)), + style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral30 : Color(0xFF3B3D4A)), ), Column( crossAxisAlignment: CrossAxisAlignment.start, mainAxisSize: MainAxisSize.min, children: [ - "${context.translation.assetNumber} : ${device.assetNumber}".bodyText2(context), - "${context.translation.model} : ${device.modelDefinition.modelDefCode}".bodyText2(context), + "${context.translation.assetNumber} : ${device.assetNumber}".bodyText2(context), + "${context.translation.model} : ${device.modelDefinition.modelDefCode}".bodyText2(context), Text( "${context.translation.serialNo} : ${device.assetSerialNo}", maxLines: 2, overflow: TextOverflow.fade, style: AppTextStyles.bodyText2.copyWith( - color: context.isDark? AppColor.neutral10: Color(0xFF757575), + color: context.isDark ? AppColor.neutral10 : Color(0xFF757575), ), ), ], diff --git a/lib/views/widgets/equipment/equipment_status_buttons.dart b/lib/views/widgets/equipment/equipment_status_buttons.dart index 86bb9a0b..0bef4493 100644 --- a/lib/views/widgets/equipment/equipment_status_buttons.dart +++ b/lib/views/widgets/equipment/equipment_status_buttons.dart @@ -14,7 +14,7 @@ class EquipmentStatusButtons extends StatefulWidget { final Function(Lookup) onSelect; int initialvalue; - EquipmentStatusButtons({Key key, this.onSelect, this.initialvalue}) : super(key: key); + EquipmentStatusButtons({Key key, this.onSelect, this.initialvalue}) : super(key: key); @override State createState() => _EquipmentStatusButtonsState(); diff --git a/lib/views/widgets/equipment/single_device_picker.dart b/lib/views/widgets/equipment/single_device_picker.dart index 360e84ee..787fd5f5 100644 --- a/lib/views/widgets/equipment/single_device_picker.dart +++ b/lib/views/widgets/equipment/single_device_picker.dart @@ -171,7 +171,7 @@ class _SingleDevicePickerState extends State { device: _searchableList[itemIndex], onPressed: (device) { Navigator.of(context).pop(device); - // Navigator.of(context).pushNamed(AssetDetailPage.id, arguments: device.id); + // Navigator.of(context).pushNamed(AssetDetailPage.id, arguments: device.id); }, ); }, diff --git a/lib/views/widgets/gas_refill/gas_refill_list.dart b/lib/views/widgets/gas_refill/gas_refill_list.dart index d7718f7c..ef9c12ab 100644 --- a/lib/views/widgets/gas_refill/gas_refill_list.dart +++ b/lib/views/widgets/gas_refill/gas_refill_list.dart @@ -38,12 +38,14 @@ class _GasRefillListState extends State { index: itemIndex, item: widget.items[itemIndex], onPressed: (model) { - Navigator.of(context).push(MaterialPageRoute( - builder: (_) => GasRefillDetailsPage( - model: model, - ))).then((value) { - model=value; - setState(() {}); + Navigator.of(context) + .push(MaterialPageRoute( + builder: (_) => GasRefillDetailsPage( + model: model, + ))) + .then((value) { + model = value; + setState(() {}); }); }, ); diff --git a/lib/views/widgets/hospitals/hospital_auto_complete_field.dart b/lib/views/widgets/hospitals/hospital_auto_complete_field.dart index 3c622193..0c75c8c2 100644 --- a/lib/views/widgets/hospitals/hospital_auto_complete_field.dart +++ b/lib/views/widgets/hospitals/hospital_auto_complete_field.dart @@ -1,12 +1,10 @@ import 'package:flutter/material.dart'; import 'package:flutter_typeahead/flutter_typeahead.dart'; import 'package:provider/provider.dart'; -import 'package:test_sa/controllers/localization/localization.dart'; import 'package:test_sa/controllers/providers/api/hospitals_provider.dart'; import 'package:test_sa/controllers/providers/settings/setting_provider.dart'; import 'package:test_sa/extensions/context_extension.dart'; import 'package:test_sa/models/hospital.dart'; -import 'package:test_sa/models/subtitle.dart'; import 'package:test_sa/views/app_style/colors.dart'; import 'package:test_sa/views/app_style/sizing.dart'; @@ -54,7 +52,7 @@ class _HospitalAutoCompleteFieldState extends State { @override Widget build(BuildContext context) { _settingProvider = Provider.of(context); - + return Container( padding: EdgeInsets.symmetric(horizontal: 16), decoration: BoxDecoration( diff --git a/lib/views/widgets/hospitals/hospital_auto_complete_field_new.dart b/lib/views/widgets/hospitals/hospital_auto_complete_field_new.dart index def00466..a92c11c4 100644 --- a/lib/views/widgets/hospitals/hospital_auto_complete_field_new.dart +++ b/lib/views/widgets/hospitals/hospital_auto_complete_field_new.dart @@ -1,12 +1,10 @@ import 'package:flutter/material.dart'; import 'package:flutter_typeahead/flutter_typeahead.dart'; import 'package:provider/provider.dart'; -import 'package:test_sa/controllers/localization/localization.dart'; import 'package:test_sa/controllers/providers/api/hospitals_provider.dart'; import 'package:test_sa/controllers/providers/settings/setting_provider.dart'; import 'package:test_sa/extensions/context_extension.dart'; import 'package:test_sa/models/hospital.dart'; -import 'package:test_sa/models/subtitle.dart'; import 'package:test_sa/views/app_style/colors.dart'; import 'package:test_sa/views/app_style/sizing.dart'; import 'package:test_sa/views/widgets/loaders/app_loading.dart'; @@ -57,7 +55,7 @@ class _HospitalAutoCompleteFieldState extends State { @override Widget build(BuildContext context) { _settingProvider = Provider.of(context); - + return Container( padding: EdgeInsets.symmetric(horizontal: 16), decoration: BoxDecoration( diff --git a/lib/views/widgets/hospitals/hospital_button.dart b/lib/views/widgets/hospitals/hospital_button.dart index 60cce6b8..63225620 100644 --- a/lib/views/widgets/hospitals/hospital_button.dart +++ b/lib/views/widgets/hospitals/hospital_button.dart @@ -1,8 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:test_sa/controllers/localization/localization.dart'; import 'package:test_sa/extensions/context_extension.dart'; import 'package:test_sa/models/hospital.dart'; -import 'package:test_sa/models/subtitle.dart'; import 'package:test_sa/views/app_style/colors.dart'; import 'package:test_sa/views/app_style/sizing.dart'; import 'package:test_sa/views/widgets/hospitals/single_hospital_picker.dart'; diff --git a/lib/views/widgets/hospitals/single_hospital_picker.dart b/lib/views/widgets/hospitals/single_hospital_picker.dart index 9ca9d723..d2e40bdb 100644 --- a/lib/views/widgets/hospitals/single_hospital_picker.dart +++ b/lib/views/widgets/hospitals/single_hospital_picker.dart @@ -1,11 +1,9 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import 'package:test_sa/controllers/localization/localization.dart'; import 'package:test_sa/controllers/providers/api/hospitals_provider.dart'; import 'package:test_sa/controllers/providers/settings/setting_provider.dart'; import 'package:test_sa/extensions/context_extension.dart'; import 'package:test_sa/models/hospital.dart'; -import 'package:test_sa/models/subtitle.dart'; import 'package:test_sa/views/widgets/hospitals/hospital_item.dart'; import 'package:test_sa/views/widgets/loaders/loading_manager.dart'; import 'package:test_sa/views/widgets/loaders/no_item_found.dart'; diff --git a/lib/views/widgets/images/files_list.dart b/lib/views/widgets/images/files_list.dart index 2280b272..251537f2 100644 --- a/lib/views/widgets/images/files_list.dart +++ b/lib/views/widgets/images/files_list.dart @@ -10,9 +10,6 @@ import 'package:test_sa/views/widgets/buttons/app_back_button.dart'; import 'package:test_sa/views/widgets/loaders/image_loader.dart'; import 'package:url_launcher/url_launcher.dart'; -import 'image_item.dart'; -import 'images_viewer.dart'; - class FilesList extends StatelessWidget { final List images; final EdgeInsets padding; diff --git a/lib/views/widgets/images/mini_one_file_picker.dart b/lib/views/widgets/images/mini_one_file_picker.dart index d26be140..ebfd8793 100644 --- a/lib/views/widgets/images/mini_one_file_picker.dart +++ b/lib/views/widgets/images/mini_one_file_picker.dart @@ -3,10 +3,9 @@ import 'dart:io'; import 'package:file_picker/file_picker.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:image_picker/image_picker.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; +import 'package:image_picker/image_picker.dart'; import 'package:test_sa/extensions/context_extension.dart'; -import 'package:test_sa/models/subtitle.dart'; import 'package:test_sa/views/app_style/sizing.dart'; class AMiniOneFilePicker extends StatefulWidget { @@ -23,7 +22,7 @@ class AMiniOneFilePicker extends StatefulWidget { class _AMiniOneFilePickerState extends State { File _file; - + @override void initState() { super.initState(); @@ -32,7 +31,6 @@ class _AMiniOneFilePickerState extends State { @override Widget build(BuildContext context) { - return Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ diff --git a/lib/views/widgets/images/one_image_picker.dart b/lib/views/widgets/images/one_image_picker.dart index d4b60349..506de0a5 100644 --- a/lib/views/widgets/images/one_image_picker.dart +++ b/lib/views/widgets/images/one_image_picker.dart @@ -3,9 +3,7 @@ import 'dart:io'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:image_picker/image_picker.dart'; -import 'package:test_sa/controllers/localization/localization.dart'; import 'package:test_sa/extensions/context_extension.dart'; -import 'package:test_sa/models/subtitle.dart'; import 'package:test_sa/views/app_style/sizing.dart'; class AOneImagePicker extends StatefulWidget { @@ -31,7 +29,6 @@ class _AOneImagePickerState extends State { @override Widget build(BuildContext context) { - return Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ diff --git a/lib/views/widgets/land_page/land_page_item.dart b/lib/views/widgets/land_page/land_page_item.dart index 2af0b610..c9df58c9 100644 --- a/lib/views/widgets/land_page/land_page_item.dart +++ b/lib/views/widgets/land_page/land_page_item.dart @@ -12,6 +12,7 @@ class LandPageItem extends StatelessWidget { final IconData icon; final VoidCallback onPressed; final String svgPath; + const LandPageItem({Key key, this.svgPath, this.text, this.icon, this.onPressed}) : super(key: key); @override @@ -35,7 +36,10 @@ class LandPageItem extends StatelessWidget { height: 42 * AppStyle.getScaleFactor(context), color: AColors.primaryColor, ), - Text(text, style: TextStyle(color: context.isDark ? AppColor.neutral30 : AppColor.neutral50,)), + Text(text, + style: TextStyle( + color: context.isDark ? AppColor.neutral30 : AppColor.neutral50, + )), ], ).toShadowContainer(context), ); diff --git a/lib/views/widgets/loaders/image_loader.dart b/lib/views/widgets/loaders/image_loader.dart index 582dd94a..bc4667bb 100644 --- a/lib/views/widgets/loaders/image_loader.dart +++ b/lib/views/widgets/loaders/image_loader.dart @@ -8,6 +8,7 @@ class ImageLoader extends StatelessWidget { final Alignment alignment; final double width; final double height; + const ImageLoader({Key key, @required this.url, this.boxFit, this.color, this.alignment, this.width, this.height}) : super(key: key); @override diff --git a/lib/views/widgets/loaders/loading_manager.dart b/lib/views/widgets/loaders/loading_manager.dart index 8572355b..4f2b2216 100644 --- a/lib/views/widgets/loaders/loading_manager.dart +++ b/lib/views/widgets/loaders/loading_manager.dart @@ -1,8 +1,6 @@ import 'package:flutter/material.dart'; import 'package:test_sa/controllers/api_routes/http_status_manger.dart'; -import 'package:test_sa/controllers/localization/localization.dart'; import 'package:test_sa/extensions/context_extension.dart'; -import 'package:test_sa/models/subtitle.dart'; import 'app_loading.dart'; import 'failed_loading.dart'; diff --git a/lib/views/widgets/loaders/no_item_found.dart b/lib/views/widgets/loaders/no_item_found.dart index 8da966cd..b2d186dd 100644 --- a/lib/views/widgets/loaders/no_item_found.dart +++ b/lib/views/widgets/loaders/no_item_found.dart @@ -2,8 +2,6 @@ import 'package:flutter/material.dart'; import 'package:test_sa/extensions/context_extension.dart'; import 'package:test_sa/extensions/text_extensions.dart'; import 'package:test_sa/new_views/app_style/app_color.dart'; -import 'package:test_sa/new_views/app_style/app_text_style.dart'; -import 'package:test_sa/views/app_style/sizing.dart'; class NoItemFound extends StatelessWidget { final String message; diff --git a/lib/views/widgets/notifications/notification_item.dart b/lib/views/widgets/notifications/notification_item.dart index 69254ee7..1f5d45e1 100644 --- a/lib/views/widgets/notifications/notification_item.dart +++ b/lib/views/widgets/notifications/notification_item.dart @@ -23,19 +23,25 @@ class NotificationItem extends StatelessWidget { children: [ Text( notification.title ?? "", - style: AppTextStyles.heading6.copyWith(color: context.isDark ? AppColor.neutral30 : AppColor.neutral50,), + style: AppTextStyles.heading6.copyWith( + color: context.isDark ? AppColor.neutral30 : AppColor.neutral50, + ), ).expanded, 8.width, Text( notification.createdOn.toServiceRequestCardFormat ?? "", textAlign: TextAlign.right, - style: AppTextStyles.tinyFont.copyWith(color: context.isDark ? AppColor.neutral20 : AppColor.neutral50,), + style: AppTextStyles.tinyFont.copyWith( + color: context.isDark ? AppColor.neutral20 : AppColor.neutral50, + ), ), ], ), Text( notification.text ?? "", - style: AppTextStyles.bodyText2.copyWith(color: context.isDark ? AppColor.neutral10 : Color(0xFF757575),), + style: AppTextStyles.bodyText2.copyWith( + color: context.isDark ? AppColor.neutral10 : Color(0xFF757575), + ), ), ], ).onPress(() { @@ -43,4 +49,3 @@ class NotificationItem extends StatelessWidget { }); } } - diff --git a/lib/views/widgets/pentry/pentry_calibration_tool_form.dart b/lib/views/widgets/pentry/pentry_calibration_tool_form.dart index a8accbca..8391ab2e 100644 --- a/lib/views/widgets/pentry/pentry_calibration_tool_form.dart +++ b/lib/views/widgets/pentry/pentry_calibration_tool_form.dart @@ -15,6 +15,7 @@ import '../../../new_views/app_style/app_color.dart'; class PentryCalibrationToolForm extends StatefulWidget { final List models; final bool enableValidate; + const PentryCalibrationToolForm({Key key, this.models, this.enableValidate}) : super(key: key); @override diff --git a/lib/views/widgets/pentry/pentry_pm_kit_form.dart b/lib/views/widgets/pentry/pentry_pm_kit_form.dart index 88052eca..99c414cb 100644 --- a/lib/views/widgets/pentry/pentry_pm_kit_form.dart +++ b/lib/views/widgets/pentry/pentry_pm_kit_form.dart @@ -15,6 +15,7 @@ class PentryPMKitForm extends StatefulWidget { final List models; final bool enableValidate; final num assetId; + const PentryPMKitForm({ Key key, this.models, diff --git a/lib/views/widgets/pentry/pentry_ppm_check_list_form.dart b/lib/views/widgets/pentry/pentry_ppm_check_list_form.dart index 80798e23..6f3be553 100644 --- a/lib/views/widgets/pentry/pentry_ppm_check_list_form.dart +++ b/lib/views/widgets/pentry/pentry_ppm_check_list_form.dart @@ -18,6 +18,7 @@ class PentryPMChecklistForm extends StatefulWidget { class _PentryPMChecklistFormState extends State { PPMCheckList item = PPMCheckList(); + @override Widget build(BuildContext context) { return ListView.builder( diff --git a/lib/views/widgets/requests/request_status.dart b/lib/views/widgets/requests/request_status.dart index f1b8f883..5f77727b 100644 --- a/lib/views/widgets/requests/request_status.dart +++ b/lib/views/widgets/requests/request_status.dart @@ -2,7 +2,6 @@ import 'package:flutter/material.dart'; import 'package:test_sa/extensions/context_extension.dart'; import 'package:test_sa/extensions/text_extensions.dart'; import 'package:test_sa/views/app_style/colors.dart'; -import 'package:test_sa/views/app_style/sizing.dart'; class StatusLabel extends StatelessWidget { String label; @@ -11,7 +10,7 @@ class StatusLabel extends StatelessWidget { final Color textColor; final bool isPriority; - StatusLabel({Key key, this.id=0, this.label, this.backgroundColor, this.textColor, this.isPriority = false}) : super(key: key); + StatusLabel({Key key, this.id = 0, this.label, this.backgroundColor, this.textColor, this.isPriority = false}) : super(key: key); @override Widget build(BuildContext context) { diff --git a/lib/views/widgets/requests/service_request_list.dart b/lib/views/widgets/requests/service_request_list.dart index 53307445..782769e8 100644 --- a/lib/views/widgets/requests/service_request_list.dart +++ b/lib/views/widgets/requests/service_request_list.dart @@ -1,9 +1,7 @@ import 'package:flutter/material.dart'; -import 'package:test_sa/controllers/localization/localization.dart'; import 'package:test_sa/extensions/context_extension.dart'; import 'package:test_sa/extensions/int_extensions.dart'; import 'package:test_sa/models/service_request/service_request.dart'; -import 'package:test_sa/models/subtitle.dart'; import 'package:test_sa/views/pages/user/requests/service_request_details.dart'; import 'package:test_sa/views/widgets/loaders/lazy_loading.dart'; import 'package:test_sa/views/widgets/loaders/no_item_found.dart'; diff --git a/lib/views/widgets/search/asset_transfer_search_dialog.dart b/lib/views/widgets/search/asset_transfer_search_dialog.dart index 5de3c1a9..cf7650b1 100644 --- a/lib/views/widgets/search/asset_transfer_search_dialog.dart +++ b/lib/views/widgets/search/asset_transfer_search_dialog.dart @@ -1,7 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:test_sa/controllers/localization/localization.dart'; import 'package:test_sa/extensions/context_extension.dart'; -import 'package:test_sa/models/device/device_transfer_search.dart'; import 'package:test_sa/models/device/asset_transfer.dart'; import 'package:test_sa/views/app_style/sizing.dart'; import 'package:test_sa/views/widgets/buttons/app_small_button.dart'; @@ -17,6 +15,7 @@ class AssetTransferSearchDialog extends StatefulWidget { final Function(AssetTransfer) onSearch; const AssetTransferSearchDialog({Key key, this.initialSearchValue, this.expandedSearch, this.onSearch}) : super(key: key); + @override AssetTransferSearchDialogState createState() => AssetTransferSearchDialogState(); } @@ -35,7 +34,6 @@ class AssetTransferSearchDialogState extends State wi @override Widget build(BuildContext context) { - return Padding( padding: EdgeInsets.only(bottom: MediaQuery.of(context).viewInsets.bottom), child: ClipRRect( diff --git a/lib/views/widgets/search/service_request_search_bar.dart b/lib/views/widgets/search/service_request_search_bar.dart index fd2b2f41..056d25f5 100644 --- a/lib/views/widgets/search/service_request_search_bar.dart +++ b/lib/views/widgets/search/service_request_search_bar.dart @@ -23,6 +23,7 @@ class ServiceRequestsSearchDialog extends StatefulWidget { final Function(ServiceRequestSearch) onSearch; const ServiceRequestsSearchDialog({Key key, this.initialSearchValue, this.expandedSearch, this.onSearch}) : super(key: key); + @override _ServiceRequestsSearchDialogState createState() => _ServiceRequestsSearchDialogState(); } diff --git a/lib/views/widgets/search/visits_search_bar.dart b/lib/views/widgets/search/visits_search_bar.dart index a481006f..b7935544 100644 --- a/lib/views/widgets/search/visits_search_bar.dart +++ b/lib/views/widgets/search/visits_search_bar.dart @@ -1,8 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:test_sa/controllers/localization/localization.dart'; import 'package:test_sa/extensions/context_extension.dart'; import 'package:test_sa/models/lookup.dart'; -import 'package:test_sa/models/subtitle.dart'; import 'package:test_sa/models/visits/visits_search.dart'; import 'package:test_sa/views/app_style/sizing.dart'; import 'package:test_sa/views/widgets/buttons/app_button.dart'; @@ -23,6 +21,7 @@ class VisitsSearchDialog extends StatefulWidget { final Function(VisitsSearch) onSearch; const VisitsSearchDialog({Key key, this.initialSearchValue, this.expandedSearch, this.onSearch}) : super(key: key); + @override _VisitsSearchDialogState createState() => _VisitsSearchDialogState(); } @@ -58,7 +57,6 @@ class _VisitsSearchDialogState extends State with TickerProv @override Widget build(BuildContext context) { - DateTime today = DateTime.now(); return SizedBox( height: MediaQuery.of(context).size.height / 1.3, diff --git a/lib/views/widgets/status/asset_status.dart b/lib/views/widgets/status/asset_status.dart index c1b0f9dc..917c9db1 100644 --- a/lib/views/widgets/status/asset_status.dart +++ b/lib/views/widgets/status/asset_status.dart @@ -1,7 +1,6 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; import 'package:test_sa/controllers/providers/api/status_drop_down/asset_transfer_status_provider.dart'; -import 'package:test_sa/controllers/providers/api/status_drop_down/gas_refill/gas_status_provider.dart'; import 'package:test_sa/controllers/providers/api/user_provider.dart'; import 'package:test_sa/controllers/providers/settings/setting_provider.dart'; import 'package:test_sa/models/lookup.dart'; diff --git a/lib/views/widgets/status/employee/assigned_to_mune.dart b/lib/views/widgets/status/employee/assigned_to_mune.dart index e07a9458..89595f3e 100644 --- a/lib/views/widgets/status/employee/assigned_to_mune.dart +++ b/lib/views/widgets/status/employee/assigned_to_mune.dart @@ -12,6 +12,7 @@ class AssignedToMenu extends StatelessWidget { final Lookup initialValue; const AssignedToMenu({Key key, this.onSelect, this.initialValue}) : super(key: key); + @override Widget build(BuildContext context) { final settingProvider = Provider.of(context); diff --git a/lib/views/widgets/status/employee/engineers_mune.dart b/lib/views/widgets/status/employee/engineers_mune.dart index cfd6b467..bcd3068f 100644 --- a/lib/views/widgets/status/employee/engineers_mune.dart +++ b/lib/views/widgets/status/employee/engineers_mune.dart @@ -12,6 +12,7 @@ class EngineersMenu extends StatelessWidget { final Engineer initialValue; const EngineersMenu({Key key, this.onSelect, this.initialValue}) : super(key: key); + @override Widget build(BuildContext context) { final settingProvider = Provider.of(context); diff --git a/lib/views/widgets/status/gas_refill/gas_cylinder_size.dart b/lib/views/widgets/status/gas_refill/gas_cylinder_size.dart index acaec9a9..001a279a 100644 --- a/lib/views/widgets/status/gas_refill/gas_cylinder_size.dart +++ b/lib/views/widgets/status/gas_refill/gas_cylinder_size.dart @@ -12,6 +12,7 @@ class GasCylinderSizeMenu extends StatelessWidget { final Lookup initialValue; const GasCylinderSizeMenu({Key key, this.onSelect, this.initialValue}) : super(key: key); + @override Widget build(BuildContext context) { final settingProvider = Provider.of(context); diff --git a/lib/views/widgets/status/gas_refill/gas_cylinder_type.dart b/lib/views/widgets/status/gas_refill/gas_cylinder_type.dart index 0b58d73a..6363953f 100644 --- a/lib/views/widgets/status/gas_refill/gas_cylinder_type.dart +++ b/lib/views/widgets/status/gas_refill/gas_cylinder_type.dart @@ -12,6 +12,7 @@ class GasCylinderTypesMenu extends StatelessWidget { final Lookup initialValue; const GasCylinderTypesMenu({Key key, this.onSelect, this.initialValue}) : super(key: key); + @override Widget build(BuildContext context) { final settingProvider = Provider.of(context); diff --git a/lib/views/widgets/status/gas_refill/gas_status.dart b/lib/views/widgets/status/gas_refill/gas_status.dart index 7e7cbac6..e6786b8f 100644 --- a/lib/views/widgets/status/gas_refill/gas_status.dart +++ b/lib/views/widgets/status/gas_refill/gas_status.dart @@ -13,6 +13,7 @@ class GasStatusMenu extends StatelessWidget { final bool enabled; const GasStatusMenu({Key key, this.enabled = true, this.onSelect, this.initialValue}) : super(key: key); + @override Widget build(BuildContext context) { final settingProvider = Provider.of(context); diff --git a/lib/views/widgets/status/gas_refill/gas_type.dart b/lib/views/widgets/status/gas_refill/gas_type.dart index 5f4c536e..a6549822 100644 --- a/lib/views/widgets/status/gas_refill/gas_type.dart +++ b/lib/views/widgets/status/gas_refill/gas_type.dart @@ -12,6 +12,7 @@ class GasTypeMenu extends StatelessWidget { final Lookup initialValue; const GasTypeMenu({Key key, this.onSelect, this.initialValue}) : super(key: key); + @override Widget build(BuildContext context) { final settingProvider = Provider.of(context); diff --git a/lib/views/widgets/status/pentry/pentry_status_mune.dart b/lib/views/widgets/status/pentry/pentry_status_mune.dart index 9f10c77c..d80a52a8 100644 --- a/lib/views/widgets/status/pentry/pentry_status_mune.dart +++ b/lib/views/widgets/status/pentry/pentry_status_mune.dart @@ -12,6 +12,7 @@ class PentryStatusMenu extends StatelessWidget { final Lookup initialValue; const PentryStatusMenu({Key key, this.onSelect, this.initialValue}) : super(key: key); + @override Widget build(BuildContext context) { final settingProvider = Provider.of(context); diff --git a/lib/views/widgets/status/pentry/pentry_task_status_mune.dart b/lib/views/widgets/status/pentry/pentry_task_status_mune.dart index 6b438dc2..c4ca31a1 100644 --- a/lib/views/widgets/status/pentry/pentry_task_status_mune.dart +++ b/lib/views/widgets/status/pentry/pentry_task_status_mune.dart @@ -12,6 +12,7 @@ class PentryTaskStatusMenu extends StatelessWidget { final Lookup initialValue; const PentryTaskStatusMenu({Key key, this.onSelect, this.initialValue}) : super(key: key); + @override Widget build(BuildContext context) { final settingProvider = Provider.of(context); diff --git a/lib/views/widgets/status/pentry/pentry_visit_status_mune.dart b/lib/views/widgets/status/pentry/pentry_visit_status_mune.dart index d4941723..1a9fce41 100644 --- a/lib/views/widgets/status/pentry/pentry_visit_status_mune.dart +++ b/lib/views/widgets/status/pentry/pentry_visit_status_mune.dart @@ -12,6 +12,7 @@ class PentryVisitsStatusMenu extends StatelessWidget { final Lookup initialValue; const PentryVisitsStatusMenu({Key key, this.onSelect, this.initialValue}) : super(key: key); + @override Widget build(BuildContext context) { final settingProvider = Provider.of(context); diff --git a/lib/views/widgets/status/report/service_report_all_users.dart b/lib/views/widgets/status/report/service_report_all_users.dart index c3098096..f1c050a8 100644 --- a/lib/views/widgets/status/report/service_report_all_users.dart +++ b/lib/views/widgets/status/report/service_report_all_users.dart @@ -8,7 +8,9 @@ import 'package:test_sa/views/widgets/status/users_menu.dart'; class ServiceReportAllUsers extends StatelessWidget { final Function(Engineer) onSelect; final Engineer initialValue; + const ServiceReportAllUsers({Key key, @required this.onSelect, this.initialValue}) : super(key: key); + @override Widget build(BuildContext context) { ServiceReportUsersProvider menuProvider = Provider.of(context); diff --git a/lib/views/widgets/status/report/service_report_assistant_employee_menu.dart b/lib/views/widgets/status/report/service_report_assistant_employee_menu.dart index 1f465002..089bb0a6 100644 --- a/lib/views/widgets/status/report/service_report_assistant_employee_menu.dart +++ b/lib/views/widgets/status/report/service_report_assistant_employee_menu.dart @@ -11,7 +11,9 @@ class ServiceReportAssistantEmployeeMenu extends StatelessWidget { final AssistantEmployees initialValue; final String title; final num assetId; + const ServiceReportAssistantEmployeeMenu({Key key, @required this.onSelect, @required this.assetId, this.title, this.initialValue}) : super(key: key); + @override Widget build(BuildContext context) { ServiceReportAssistantsEmployeeProvider menuProvider = Provider.of(context); diff --git a/lib/views/widgets/status/report/service_report_equipment_status.dart b/lib/views/widgets/status/report/service_report_equipment_status.dart index 50ccd846..3c399a67 100644 --- a/lib/views/widgets/status/report/service_report_equipment_status.dart +++ b/lib/views/widgets/status/report/service_report_equipment_status.dart @@ -25,6 +25,7 @@ class ServiceReportEquipmentStatusMenu extends StatefulWidget { class _ServiceReportEquipmentStatusMenuState extends State { bool firstTime = true; + @override Widget build(BuildContext context) { SettingProvider settingProvider = Provider.of(context); diff --git a/lib/views/widgets/status/report/service_report_fault_description.dart b/lib/views/widgets/status/report/service_report_fault_description.dart index 747327ea..732ec023 100644 --- a/lib/views/widgets/status/report/service_report_fault_description.dart +++ b/lib/views/widgets/status/report/service_report_fault_description.dart @@ -8,7 +8,6 @@ import 'package:test_sa/models/fault_description.dart'; import 'package:test_sa/new_views/common_widgets/single_item_drop_down_menu.dart'; import 'package:test_sa/providers/loading_list_notifier.dart'; import 'package:test_sa/views/widgets/loaders/loading_manager.dart'; -import 'package:test_sa/views/widgets/status/report/fault_desc_menu.dart'; class ServiceReportFaultDescription extends StatefulWidget { final String requestId; @@ -22,21 +21,18 @@ class ServiceReportFaultDescription extends StatefulWidget { } class _ServiceReportFaultDescriptionState extends State { - @override void initState() { super.initState(); - if(widget.initialValue == null){ - WidgetsFlutterBinding.ensureInitialized() - .addPostFrameCallback((timeStamp) { - ServiceRequestFaultDescriptionProvider menuProvider = - Provider.of(context, - listen: false); + if (widget.initialValue == null) { + WidgetsFlutterBinding.ensureInitialized().addPostFrameCallback((timeStamp) { + ServiceRequestFaultDescriptionProvider menuProvider = Provider.of(context, listen: false); menuProvider.reset(); menuProvider.getCallRequestForWorkOrder(requestId: widget.requestId); }); } } + @override Widget build(BuildContext context) { SettingProvider settingProvider = Provider.of(context); diff --git a/lib/views/widgets/status/report/service_report_maintenance_situation.dart b/lib/views/widgets/status/report/service_report_maintenance_situation.dart index 311581a0..03f733e1 100644 --- a/lib/views/widgets/status/report/service_report_maintenance_situation.dart +++ b/lib/views/widgets/status/report/service_report_maintenance_situation.dart @@ -16,6 +16,7 @@ class ServiceReportMaintenanceSituation extends StatelessWidget { @required this.initialValue, @required this.woId, }) : super(key: key); + @override Widget build(BuildContext context) { ServiceReportMaintenanceSituationProvider menuProvider = Provider.of(context); diff --git a/lib/views/widgets/status/report/service_report_repair_location.dart b/lib/views/widgets/status/report/service_report_repair_location.dart index 1803b44d..83f84e14 100644 --- a/lib/views/widgets/status/report/service_report_repair_location.dart +++ b/lib/views/widgets/status/report/service_report_repair_location.dart @@ -12,7 +12,7 @@ class ServiceReportRepairLocation extends StatelessWidget { final Lookup initialValue; final Function(Lookup) onSelect; - const ServiceReportRepairLocation({Key key,this.label, this.onSelect, this.initialValue}) : super(key: key); + const ServiceReportRepairLocation({Key key, this.label, this.onSelect, this.initialValue}) : super(key: key); @override Widget build(BuildContext context) { diff --git a/lib/views/widgets/status/report/service_report_status.dart b/lib/views/widgets/status/report/service_report_status.dart index 1c789159..7b4518ad 100644 --- a/lib/views/widgets/status/report/service_report_status.dart +++ b/lib/views/widgets/status/report/service_report_status.dart @@ -25,6 +25,7 @@ class ServiceReportStatusMenu extends StatefulWidget { class _ServiceReportStatusMenuState extends State { bool firstTime = true; + @override Widget build(BuildContext context) { SettingProvider settingProvider = Provider.of(context); diff --git a/lib/views/widgets/status/report/service_report_type.dart b/lib/views/widgets/status/report/service_report_type.dart index 99f66397..133ae8cc 100644 --- a/lib/views/widgets/status/report/service_report_type.dart +++ b/lib/views/widgets/status/report/service_report_type.dart @@ -12,6 +12,7 @@ class ServiceReportTypeMenu extends StatelessWidget { final Lookup initialValue; const ServiceReportTypeMenu({Key key, this.onSelect, this.initialValue}) : super(key: key); + @override Widget build(BuildContext context) { SettingProvider settingProvider = Provider.of(context); diff --git a/lib/views/widgets/status/report/service_report_visit_date_operator.dart b/lib/views/widgets/status/report/service_report_visit_date_operator.dart index 5148ffaa..5b51e15e 100644 --- a/lib/views/widgets/status/report/service_report_visit_date_operator.dart +++ b/lib/views/widgets/status/report/service_report_visit_date_operator.dart @@ -10,6 +10,7 @@ class ServiceReportVisitDateOperator extends StatelessWidget { final Lookup initialValue; const ServiceReportVisitDateOperator({Key key, @required this.onSelect, @required this.initialValue}) : super(key: key); + @override Widget build(BuildContext context) { ServiceReportVisitOperatorProvider menuProvider = Provider.of(context); diff --git a/lib/views/widgets/status/service_request/service_request_first_action.dart b/lib/views/widgets/status/service_request/service_request_first_action.dart index 99511972..a222d4f5 100644 --- a/lib/views/widgets/status/service_request/service_request_first_action.dart +++ b/lib/views/widgets/status/service_request/service_request_first_action.dart @@ -14,6 +14,7 @@ class ServiceRequestedFirstAction extends StatelessWidget { final bool enabled; const ServiceRequestedFirstAction({Key key, this.onSelect, this.initialValue, this.enabled = true}) : super(key: key); + @override Widget build(BuildContext context) { final settingProvider = Provider.of(context); diff --git a/lib/views/widgets/status/service_request/service_request_loan_availability.dart b/lib/views/widgets/status/service_request/service_request_loan_availability.dart index 31cb3f33..0ce96b66 100644 --- a/lib/views/widgets/status/service_request/service_request_loan_availability.dart +++ b/lib/views/widgets/status/service_request/service_request_loan_availability.dart @@ -13,6 +13,7 @@ class ServiceRequestedLoanAvailability extends StatelessWidget { final Lookup initialValue; const ServiceRequestedLoanAvailability({Key key, this.onSelect, this.initialValue}) : super(key: key); + @override Widget build(BuildContext context) { final settingProvider = Provider.of(context); diff --git a/lib/views/widgets/status/service_request/service_request_priority_mune.dart b/lib/views/widgets/status/service_request/service_request_priority_mune.dart index 7cd90242..cb6d3498 100644 --- a/lib/views/widgets/status/service_request/service_request_priority_mune.dart +++ b/lib/views/widgets/status/service_request/service_request_priority_mune.dart @@ -13,6 +13,7 @@ class ServiceRequestPriorityMenu extends StatelessWidget { final bool enabled; const ServiceRequestPriorityMenu({Key key, this.onSelect, this.initialValue, this.enabled}) : super(key: key); + @override Widget build(BuildContext context) { final settingProvider = Provider.of(context); diff --git a/lib/views/widgets/status/service_request/service_request_status_mune.dart b/lib/views/widgets/status/service_request/service_request_status_mune.dart index 4cb7f730..df3235e7 100644 --- a/lib/views/widgets/status/service_request/service_request_status_mune.dart +++ b/lib/views/widgets/status/service_request/service_request_status_mune.dart @@ -12,6 +12,7 @@ class ServiceRequestStatusMenu extends StatelessWidget { final Lookup initialValue; const ServiceRequestStatusMenu({Key key, this.onSelect, this.initialValue}) : super(key: key); + @override Widget build(BuildContext context) { final settingProvider = Provider.of(context); diff --git a/lib/views/widgets/status/service_request/service_request_through_mune.dart b/lib/views/widgets/status/service_request/service_request_through_mune.dart index 1a735dc8..e5faf258 100644 --- a/lib/views/widgets/status/service_request/service_request_through_mune.dart +++ b/lib/views/widgets/status/service_request/service_request_through_mune.dart @@ -13,6 +13,7 @@ class ServiceRequestedThroughMenu extends StatelessWidget { final bool enabled; const ServiceRequestedThroughMenu({Key key, this.onSelect, this.initialValue, this.enabled = true}) : super(key: key); + @override Widget build(BuildContext context) { final settingProvider = Provider.of(context); diff --git a/lib/views/widgets/status/service_request/service_request_types_mune.dart b/lib/views/widgets/status/service_request/service_request_types_mune.dart index 4f5e34a7..5abd6bff 100644 --- a/lib/views/widgets/status/service_request/service_request_types_mune.dart +++ b/lib/views/widgets/status/service_request/service_request_types_mune.dart @@ -14,6 +14,7 @@ class ServiceRequestTypesMenu extends StatelessWidget { final bool withDefaultItem; const ServiceRequestTypesMenu({Key key, this.onSelect, this.initialValue, this.withDefaultItem = false, this.enabled = true}) : super(key: key); + @override Widget build(BuildContext context) { final settingProvider = Provider.of(context);