diff --git a/lib/controllers/notification/firebase_notification_manger.dart b/lib/controllers/notification/firebase_notification_manger.dart index 4e2ec5c1..4ebb70ca 100644 --- a/lib/controllers/notification/firebase_notification_manger.dart +++ b/lib/controllers/notification/firebase_notification_manger.dart @@ -10,6 +10,7 @@ import 'package:test_sa/models/device/asset_transfer.dart'; import 'package:test_sa/models/new_models/gas_refill_model.dart'; import 'package:huawei_push/huawei_push.dart' as h_push; import 'package:test_sa/models/service_request/service_request.dart'; +import 'package:test_sa/service_request_latest/views/service_request_detail_main_view.dart'; import 'package:test_sa/views/pages/device_transfer/device_transfer_details.dart'; import 'package:test_sa/views/pages/user/gas_refill/gas_refill_details.dart'; import 'package:test_sa/views/pages/user/ppm/ppm_details_page.dart'; @@ -65,7 +66,7 @@ class FirebaseNotificationManger { } static void _onMessageReceiveError(Object error) { - print("onMessageReceivedStream:${error?.toString()}"); + print("onMessageReceivedStream:${error.toString()}"); } static Future isGoogleServicesAvailable() async { @@ -83,7 +84,7 @@ class FirebaseNotificationManger { Widget? serviceClass; if (messageData["requestType"] == "Service request to engineer") { - serviceClass = ServiceRequestDetailsPage(serviceRequest: ServiceRequest(id: messageData["requestNumber"].toString())); + serviceClass = ServiceRequestDetailMain(requestId: messageData["requestNumber"]??''); } else if (messageData["requestType"] == "Gas Refill") { serviceClass = GasRefillDetailsPage( priority: messageData["priority"], diff --git a/lib/dashboard_latest/widgets/app_bar_widget.dart b/lib/dashboard_latest/widgets/app_bar_widget.dart index a97f27b6..f65ed034 100644 --- a/lib/dashboard_latest/widgets/app_bar_widget.dart +++ b/lib/dashboard_latest/widgets/app_bar_widget.dart @@ -1,7 +1,5 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import 'package:test_sa/controllers/providers/api/all_requests_provider.dart'; -import 'package:test_sa/controllers/providers/api/notifications_provider.dart'; import 'package:test_sa/controllers/providers/settings/setting_provider.dart'; import 'package:test_sa/dashboard_latest/dashboard_provider.dart'; import 'package:test_sa/extensions/context_extension.dart'; diff --git a/lib/main.dart b/lib/main.dart index a5acb243..c73c364e 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -79,8 +79,6 @@ import 'package:test_sa/views/pages/user/requests/work_order/work_orders_list_pa import 'package:test_sa/views/widgets/departments/single_department_picker.dart'; import 'package:test_sa/views/widgets/equipment/asset_detail_page.dart'; import 'package:test_sa/views/widgets/equipment/single_device_picker.dart'; - -import 'controllers/notification/notification_manger.dart'; import 'controllers/providers/api/gas_refill_comments.dart'; import 'controllers/providers/api/user_provider.dart'; import 'controllers/providers/settings/setting_provider.dart'; diff --git a/lib/new_views/pages/land_page/land_page.dart b/lib/new_views/pages/land_page/land_page.dart index 3196bfc4..7317beea 100644 --- a/lib/new_views/pages/land_page/land_page.dart +++ b/lib/new_views/pages/land_page/land_page.dart @@ -13,11 +13,9 @@ import 'package:test_sa/extensions/text_extensions.dart'; import 'package:test_sa/models/enums/user_types.dart'; import 'package:test_sa/new_views/app_style/app_color.dart'; import 'package:test_sa/new_views/common_widgets/app_filled_button.dart'; -import 'package:test_sa/new_views/pages/land_page/calendar_page.dart'; import 'package:test_sa/new_views/pages/land_page/create_request-type_bottomsheet.dart'; import 'package:test_sa/new_views/pages/land_page/my_request/my_requests_page.dart'; import 'package:test_sa/new_views/pages/settings_page.dart'; -import 'package:test_sa/service_request_latest/views/nurse/create_new_request_view.dart'; import 'package:test_sa/views/widgets/equipment/single_device_picker.dart'; import '../../../controllers/providers/settings/setting_provider.dart'; diff --git a/lib/providers/work_order/fault_description_provider.dart b/lib/providers/work_order/fault_description_provider.dart index d5f27a3f..670cb9e0 100644 --- a/lib/providers/work_order/fault_description_provider.dart +++ b/lib/providers/work_order/fault_description_provider.dart @@ -6,7 +6,6 @@ import 'package:http/http.dart'; import 'package:test_sa/controllers/api_routes/api_manager.dart'; import 'package:test_sa/controllers/api_routes/urls.dart'; import 'package:test_sa/models/fault_description.dart'; -import 'package:test_sa/models/service_request/spare_parts.dart'; class FaultDescriptionProvider extends ChangeNotifier { diff --git a/lib/service_request_latest/views/components/service_request_detail_view.dart b/lib/service_request_latest/views/components/service_request_detail_view.dart index fe0c6dc8..efd45665 100644 --- a/lib/service_request_latest/views/components/service_request_detail_view.dart +++ b/lib/service_request_latest/views/components/service_request_detail_view.dart @@ -335,7 +335,6 @@ class ServiceRequestDetailView extends StatelessWidget { visitDate: requestDetailProvider.currentWorkOrder?.data?.needAVisitDateTime, comment: requestDetailProvider.currentWorkOrder?.data?.needAVisitComment, ); - // requestDetailProvider.updateNeedVisitHelperModel(requestDetailProvider.needVisitHelperModel); return const InitialVisitCard(); } else { return const SizedBox(); @@ -370,327 +369,3 @@ class ServiceRequestDetailView extends StatelessWidget { } } -// class RequestDetailView extends StatefulWidget { -// static const String id = "/call-details"; -// ServiceRequest serviceRequest; -// bool fromTabView = false; -// -// RequestDetailView({Key? key, required this.serviceRequest, this.fromTabView = false}) : super(key: key); -// -// @override -// State createState() => _RequestDetailViewState(); -// } -// -// class _RequestDetailViewState extends State { -// @override -// void initState() { -// super.initState(); -// } -// -// void getServiceRequest({@required dynamic requestId}) { -// // setState(() {}); -// WidgetsFlutterBinding.ensureInitialized().addPostFrameCallback((timeStamp) async { -// Provider.of(context, listen: false).reset(); -// ServiceRequestsProvider serviceRequestsProvider = Provider.of(context, listen: false); -// serviceRequestsProvider.currentSelectedRequest = await serviceRequestsProvider.getServiceRequestObjectById(requestId: requestId); -// // setState(() {}); -// }); -// } -// -// @override -// Widget build(BuildContext context) { -// UserProvider _userProvider = Provider.of(context, listen: false); -// -// return !widget.fromTabView -// ? Scaffold( -// appBar: DefaultAppBar(title: context.translation.serviceDetails), -// body: Padding( -// padding: EdgeInsets.only(top: 12.toScreenHeight), -// child: Consumer(builder: (context, serviceRequestsProvider, child) { -// return requestDetailCard(serviceRequestsProvider: serviceRequestsProvider, userProvider: _userProvider); -// }), -// ), -// ) -// : Consumer(builder: (context, serviceRequestsProvider, child) { -// return requestDetailCard(serviceRequestsProvider: serviceRequestsProvider, userProvider: _userProvider); -// }); -// } -// -// Widget requestDetailCard({required ServiceRequestsProvider serviceRequestsProvider, required UserProvider userProvider}) { -// return SafeArea( -// child: serviceRequestsProvider.isDetialLoading -// ? const ALoading().center -// : serviceRequestsProvider.currentSelectedRequest == null -// ? Text( -// context.translation.noDataFound, -// style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20), -// ).center -// : Stack( -// children: [ -// SingleChildScrollView( -// padding: EdgeInsets.symmetric(horizontal: 16.toScreenWidth), -// child: Column( -// mainAxisSize: MainAxisSize.min, -// crossAxisAlignment: CrossAxisAlignment.start, -// children: [ -// informationCard(serviceRequestsProvider.currentSelectedRequest!, userProvider), -// -// 40.height, -// // skipForLater(serviceRequestsProvider.currentSelectedRequest), -// // 20.height, -// const InitialVisitCard(), -// 20.height, -// ], -// ), -// ), -// FooterActionButton.requestDetailsFooterWidget(status: 7, context: context), - -// ], -// ), -// ); -// } -// -// Widget informationCard(ServiceRequest serviceRequest, UserProvider userProvider) { -// return Column( -// crossAxisAlignment: CrossAxisAlignment.start, -// children: [ -// Column( -// mainAxisSize: MainAxisSize.min, -// crossAxisAlignment: CrossAxisAlignment.start, -// children: [ -// Row( -// crossAxisAlignment: CrossAxisAlignment.start, -// children: [ -// Column( -// crossAxisAlignment: CrossAxisAlignment.start, -// children: [ -// Row( -// mainAxisSize: MainAxisSize.min, -// children: [ -// StatusLabel( -// label: serviceRequest.priority?.name, -// id: serviceRequest.priority!.id!, -// radius: 4, -// textColor: AppColor.getPriorityStatusTextColor(context, serviceRequest.priority!.id!), -// backgroundColor: AppColor.getPriorityStatusColor(context, serviceRequest.priority!.id!), -// ), -// 8.width, -// StatusLabel( -// radius: 4, -// label: serviceRequest.statusLabel, -// textColor: AppColor.getRequestStatusTextColor(context, serviceRequest.statusValue!), -// backgroundColor: AppColor.getRequestStatusColor(context, serviceRequest.statusValue!), -// ), -// 1.width.expanded, -// Column( -// crossAxisAlignment: CrossAxisAlignment.end, -// children: [ -// if (userProvider.user!.type == UsersTypes.normal_user) -// context.translation.code.toSvgAsset(width: 48).onPress(() { -// Navigator.push(context, MaterialPageRoute(builder: (context) => UpdateServiceRequestPage(serviceRequest: serviceRequest))); -// }), -// if (userProvider.user!.type == UsersTypes.engineer) 16.height, -// Text( -// serviceRequest.date!.toServiceRequestCardFormat, -// textAlign: TextAlign.end, -// style: AppTextStyles.tinyFont.copyWith(color: context.isDark ? AppColor.neutral30 : AppColor.neutral50), -// ), -// ], -// ) -// ], -// ), -// Text( -// context.translation.assetDetails, -// style: AppTextStyles.heading4.copyWith(color: context.isDark ? AppColor.neutral30 : AppColor.neutral50), -// ), -// 8.height, -// '${context.translation.assetName}: ${serviceRequest.deviceEnName?.cleanupWhitespace?.capitalizeFirstOfEach}'.bodyText(context), -// // 8.height, -// Text( -// '${context.translation.assetNumber}: ${serviceRequest.device?.assetNumber}', -// style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20), -// ), -// -// Text( -// '${context.translation.equipmentStatus}: ${serviceRequest.defectType?.name}', -// style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20), -// ), -// Text( -// '${context.translation.manufacture}: ${serviceRequest.device?.modelDefinition?.manufacturerName?.cleanupWhitespace?.capitalizeFirstOfEach}', -// style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20), -// ), -// Text( -// '${context.translation.model}: ${serviceRequest.device?.modelDefinition?.modelName?.cleanupWhitespace?.capitalizeFirstOfEach}', -// style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20), -// ), -// Text( -// '${context.translation.site}: ${serviceRequest.device?.site?.custName?.cleanupWhitespace?.capitalizeFirstOfEach}', -// style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20), -// ), -// Text( -// '${context.translation.building}: ${serviceRequest.device?.building?.name?.cleanupWhitespace?.capitalizeFirstOfEach}', -// style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20), -// ), -// Text( -// '${context.translation.floor}: ${serviceRequest.device?.floor?.name?.cleanupWhitespace?.capitalizeFirstOfEach ?? ""}', -// style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20), -// ), -// Text( -// '${context.translation.department}: ${serviceRequest.device?.department?.departmentName?.cleanupWhitespace?.capitalizeFirstOfEach}', -// style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20), -// ), -// Text( -// '${context.translation.room}: ${(serviceRequest.device?.room?.name ?? "").cleanupWhitespace?.capitalizeFirstOfEach}', -// style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20), -// ), -// ], -// ).expanded, -// ], -// ), -// 8.height, -// const Divider().defaultStyle(context), -// -// //... request details starts here.... -// Text( -// context.translation.requestDetail, -// style: AppTextStyles.heading4.copyWith(color: context.isDark ? AppColor.neutral30 : AppColor.neutral50), -// ), -// 8.height, -// Text( -// '${context.translation.requestType}: ${serviceRequest.type?.name}', -// style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20), -// ), -// Text( -// '${context.translation.requestNo}: ${serviceRequest.requestCode}', -// style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20), -// ), -// Text( -// '${context.translation.requesterName}: ${serviceRequest.callCreatedBy?.name ?? "-"}', -// style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20), -// ), -// -// 8.height, -// if ((serviceRequest.callComments ?? "").isNotEmpty) ...[ -// const Divider().defaultStyle(context), -// 8.height, -// Text( -// serviceRequest.callComments!, -// style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20), -// ), -// ], -// if (serviceRequest.devicePhotos?.isNotEmpty ?? false) ...[ -// 8.height, -// const Divider().defaultStyle(context), -// FilesList(images: serviceRequest.devicePhotos!), -// ], -// if (serviceRequest.audio?.isNotEmpty ?? false) ...[ -// const Divider().defaultStyle(context), -// 16.height, -// ASoundPlayer(audio: serviceRequest.audio!), -// 8.height, -// ], -// ], -// ).paddingOnly(start: 16, end: 16, top: 16, bottom: 8), -// (userProvider.user!.type == UsersTypes.normal_user -// ? Container( -// height: 50, -// padding: const EdgeInsets.only(left: 16, right: 16), -// alignment: Alignment.center, -// width: double.infinity, -// decoration: ShapeDecoration( -// color: context.isDark ? AppColor.neutral50 : AppColor.neutral30, -// shape: const RoundedRectangleBorder( -// borderRadius: BorderRadius.only( -// bottomLeft: Radius.circular(20), -// bottomRight: Radius.circular(20), -// ), -// ), -// ), -// child: Row( -// children: [ -// Text( -// '${context.translation.commentHere}...', -// style: AppTextStyles.heading6.copyWith( -// color: (context.isDark ? AppColor.neutral30 : AppColor.neutral50).withOpacity(.6), -// ), -// ).expanded, -// "comment_send".toSvgAsset(width: 24, color: context.isDark ? AppColor.primary50 : AppColor.primary70), -// ], -// ), -// ) -// : Column( -// mainAxisSize: MainAxisSize.min, -// crossAxisAlignment: CrossAxisAlignment.start, -// children: [ -// const Divider().defaultStyle(context), -// 16.height, -// Row( -// mainAxisSize: MainAxisSize.min, -// children: [ -// Text( -// context.translation.viewComments, -// style: AppTextStyles.bodyText.copyWith(color: AppColor.blueStatus(context)), -// ), -// 4.width, -// Icon(Icons.arrow_forward, color: AppColor.blueStatus(context), size: 14) -// ], -// ), -// ], -// ).paddingOnly(bottom: 16, start: 16, end: 16)) -// .onPress(() { -// showModalBottomSheet( -// context: context, -// useSafeArea: true, -// isScrollControlled: true, -// useRootNavigator: true, -// backgroundColor: Colors.transparent, -// builder: (context) => CommentsBottomSheet(requestId: serviceRequest.id!), -// ); -// }), -// //set condition for show asset detail button... -// if (true) ...[ -// assetRetiredButton(serviceRequest: serviceRequest), -// ] -// ], -// ).toShadowContainer(context, padding: 0); -// } -// -// Widget assetRetiredButton({required ServiceRequest serviceRequest}) { -// return Padding( -// padding: EdgeInsets.symmetric(horizontal: 16.toScreenHeight, vertical: 12.toScreenWidth), -// child: AppFilledButton( -// label: context.translation.assetToBeRetired, -// maxWidth: true, -// buttonColor: Colors.white54, -// textColor: AppColor.red30, -// showBorder: true, -// onPressed: () async { -// // Navigator.push(context, MaterialPageRoute(builder: (context) => AssetRetired())); -// Navigator.push(context, MaterialPageRoute(builder: (context) => CreateNewRequest())); -// }), -// ); -// } -// -// Widget skipForLater(ServiceRequest serviceRequest) { -// return Center( -// child: InkWell( -// onTap: () async { -// try { -// //use a common list -// AllRequestsProvider allRequestProvider = Provider.of(context, listen: false); -// int index = allRequestProvider.requestDetailList!.requestsDetails!.indexWhere((element) => element.id.toString() == serviceRequest.id); -// if (index != -1 && index != allRequestProvider.requestDetailList!.requestsDetails!.length) { -// getServiceRequest(requestId: allRequestProvider.requestDetailList!.requestsDetails![index + 1].id.toString()); -// } -// } catch (e) { -// print(e); -// } -// }, -// child: Text( -// context.translation.skipForLater, -// style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20, decoration: TextDecoration.underline, fontSize: 16), -// ), -// ), -// ); -// } -// } diff --git a/lib/service_request_latest/views/components/timer_widget.dart b/lib/service_request_latest/views/components/timer_widget.dart index 646384d8..f24393d6 100644 --- a/lib/service_request_latest/views/components/timer_widget.dart +++ b/lib/service_request_latest/views/components/timer_widget.dart @@ -1,4 +1,3 @@ -import 'dart:async'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; diff --git a/lib/service_request_latest/views/components/verify_arrival_view.dart b/lib/service_request_latest/views/components/verify_arrival_view.dart index 9a6dbd19..03fdc5b5 100644 --- a/lib/service_request_latest/views/components/verify_arrival_view.dart +++ b/lib/service_request_latest/views/components/verify_arrival_view.dart @@ -17,7 +17,6 @@ import 'package:test_sa/service_request_latest/service_request_detail_provider.d import 'package:test_sa/service_request_latest/utilities/service_request_utils.dart'; import 'package:test_sa/service_request_latest/views/components/bottom_sheets/service_request_bottomsheet.dart'; import 'package:test_sa/service_request_latest/views/components/verify_otp_view.dart'; -import 'package:test_sa/views/widgets/bottom_sheets/request_approval_waiting_bottom_sheet.dart'; import 'package:test_sa/views/widgets/loaders/no_data_found.dart'; import 'package:test_sa/views/widgets/qr/scan_qr.dart'; diff --git a/lib/service_request_latest/views/components/weekly_calendar_fragment.dart b/lib/service_request_latest/views/components/weekly_calendar_fragment.dart index b84fecf2..0261d9eb 100644 --- a/lib/service_request_latest/views/components/weekly_calendar_fragment.dart +++ b/lib/service_request_latest/views/components/weekly_calendar_fragment.dart @@ -4,7 +4,6 @@ import 'package:provider/provider.dart'; import 'package:test_sa/dashboard_latest/dashboard_provider.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/new_views/app_style/app_color.dart'; class WeeklyCalendarFragment extends StatefulWidget { diff --git a/lib/service_request_latest/views/components/work_order_card_view.dart b/lib/service_request_latest/views/components/work_order_card_view.dart index 97c23b5c..a803e5ef 100644 --- a/lib/service_request_latest/views/components/work_order_card_view.dart +++ b/lib/service_request_latest/views/components/work_order_card_view.dart @@ -1,6 +1,5 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import 'package:test_sa/controllers/providers/api/all_requests_provider.dart'; import 'package:test_sa/controllers/providers/api/user_provider.dart'; import 'package:test_sa/extensions/context_extension.dart'; import 'package:test_sa/extensions/int_extensions.dart'; diff --git a/lib/service_request_latest/views/forms/asset_retired/verify_asset_detail.dart b/lib/service_request_latest/views/forms/asset_retired/verify_asset_detail.dart index 43e73396..d2486165 100644 --- a/lib/service_request_latest/views/forms/asset_retired/verify_asset_detail.dart +++ b/lib/service_request_latest/views/forms/asset_retired/verify_asset_detail.dart @@ -3,10 +3,8 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:fluttertoast/fluttertoast.dart'; import 'package:provider/provider.dart'; -import 'package:test_sa/controllers/providers/api/status_drop_down/report/service_report_fault_description_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/device/asset.dart'; diff --git a/lib/service_request_latest/views/forms/maintenance_request/components/external_request.dart b/lib/service_request_latest/views/forms/maintenance_request/components/external_request.dart index c8fcdaa4..e3727b7f 100644 --- a/lib/service_request_latest/views/forms/maintenance_request/components/external_request.dart +++ b/lib/service_request_latest/views/forms/maintenance_request/components/external_request.dart @@ -5,7 +5,6 @@ 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/device/asset.dart'; import 'package:test_sa/models/service_request/service_report.dart'; import 'package:test_sa/models/service_request/supp_engineer_work_orders.dart'; import 'package:test_sa/models/service_request/supplier_details.dart'; diff --git a/lib/service_request_latest/views/forms/maintenance_request/components/internal_request.dart b/lib/service_request_latest/views/forms/maintenance_request/components/internal_request.dart index 2144616d..a2e5caaf 100644 --- a/lib/service_request_latest/views/forms/maintenance_request/components/internal_request.dart +++ b/lib/service_request_latest/views/forms/maintenance_request/components/internal_request.dart @@ -1,22 +1,17 @@ import 'package:flutter/material.dart'; import 'package:provider/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_repair_location_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/service_request/service_report.dart'; -import 'package:test_sa/models/service_request/service_request.dart'; import 'package:test_sa/new_views/app_style/app_color.dart'; import 'package:test_sa/providers/service_request_providers/last_situation_provider.dart'; -import 'package:test_sa/providers/work_order/activity_status_provider.dart'; import 'package:test_sa/service_request_latest/service_request_detail_provider.dart'; import 'package:test_sa/service_request_latest/utilities/service_request_utils.dart'; import 'package:test_sa/service_request_latest/views/forms/maintenance_request/components/assistant_employee_card.dart'; import 'package:test_sa/views/widgets/date_and_time/date_picker.dart'; -import '../../../../../controllers/providers/api/status_drop_down/report/service_types_provider.dart'; import '../../../../../models/lookup.dart'; import '../../../../../new_views/common_widgets/app_text_form_field.dart'; import '../../../../../new_views/common_widgets/single_item_drop_down_menu.dart'; diff --git a/lib/service_request_latest/views/forms/maintenance_request/maintenance_request_main.dart b/lib/service_request_latest/views/forms/maintenance_request/maintenance_request_main.dart index 3c4ecef5..ce7ab161 100644 --- a/lib/service_request_latest/views/forms/maintenance_request/maintenance_request_main.dart +++ b/lib/service_request_latest/views/forms/maintenance_request/maintenance_request_main.dart @@ -2,7 +2,6 @@ import 'package:flutter/material.dart'; import 'package:fluttertoast/fluttertoast.dart'; import 'package:provider/provider.dart'; import 'package:test_sa/controllers/providers/api/status_drop_down/report/service_report_repair_location_provider.dart'; -import 'package:test_sa/controllers/providers/api/user_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'; diff --git a/lib/service_request_latest/views/forms/spare_part/spare_part_request.dart b/lib/service_request_latest/views/forms/spare_part/spare_part_request.dart index c85b347e..03e97d9d 100644 --- a/lib/service_request_latest/views/forms/spare_part/spare_part_request.dart +++ b/lib/service_request_latest/views/forms/spare_part/spare_part_request.dart @@ -15,7 +15,6 @@ import 'package:test_sa/new_views/app_style/app_color.dart'; import 'package:test_sa/new_views/common_widgets/app_filled_button.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/providers/work_order/activity_status_provider.dart'; import 'package:test_sa/service_request_latest/service_request_detail_provider.dart'; import 'package:test_sa/service_request_latest/views/components/action_button/footer_action_button.dart'; import 'package:test_sa/service_request_latest/views/components/bottom_sheets/service_request_bottomsheet.dart'; diff --git a/lib/service_request_latest/views/forms/work_order/components/time_duration_view.dart b/lib/service_request_latest/views/forms/work_order/components/time_duration_view.dart index 3babfc8f..dad0c56b 100644 --- a/lib/service_request_latest/views/forms/work_order/components/time_duration_view.dart +++ b/lib/service_request_latest/views/forms/work_order/components/time_duration_view.dart @@ -4,8 +4,6 @@ import 'package:provider/provider.dart'; import 'package:test_sa/controllers/providers/api/service_requests_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/widget_extensions.dart'; import 'package:test_sa/models/timer_model.dart'; import 'package:test_sa/new_views/app_style/app_color.dart'; import 'package:test_sa/views/widgets/date_and_time/date_picker.dart'; diff --git a/lib/service_request_latest/views/nurse/create_new_request_view.dart b/lib/service_request_latest/views/nurse/create_new_request_view.dart index 572e7416..84a7ae93 100644 --- a/lib/service_request_latest/views/nurse/create_new_request_view.dart +++ b/lib/service_request_latest/views/nurse/create_new_request_view.dart @@ -3,7 +3,6 @@ import 'dart:io'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import 'package:test_sa/controllers/providers/api/devices_provider.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'; diff --git a/lib/service_request_latest/views/service_request_detail_main_view.dart b/lib/service_request_latest/views/service_request_detail_main_view.dart index dd74af82..2b9be210 100644 --- a/lib/service_request_latest/views/service_request_detail_main_view.dart +++ b/lib/service_request_latest/views/service_request_detail_main_view.dart @@ -1,6 +1,5 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import 'package:test_sa/app_strings/app_asset.dart'; import 'package:test_sa/controllers/providers/api/user_provider.dart'; import 'package:test_sa/extensions/context_extension.dart'; import 'package:test_sa/extensions/int_extensions.dart'; @@ -11,7 +10,6 @@ import 'package:test_sa/models/enums/work_order_next_step.dart'; import 'package:test_sa/new_views/app_style/app_color.dart'; import 'package:test_sa/new_views/common_widgets/default_app_bar.dart'; import 'package:test_sa/service_request_latest/service_request_detail_provider.dart'; -import 'package:test_sa/service_request_latest/utilities/service_request_utils.dart'; import 'package:test_sa/service_request_latest/views/components/bottom_sheets/service_request_bottomsheet.dart'; import 'package:test_sa/service_request_latest/views/components/history_log_view.dart'; import 'components/service_request_detail_view.dart'; diff --git a/lib/views/pages/user/requests/pending_requests_screen.dart b/lib/views/pages/user/requests/pending_requests_screen.dart index 137d4599..4ae44fa5 100644 --- a/lib/views/pages/user/requests/pending_requests_screen.dart +++ b/lib/views/pages/user/requests/pending_requests_screen.dart @@ -6,6 +6,7 @@ import 'package:test_sa/extensions/widget_extensions.dart'; import 'package:test_sa/models/service_request/pending_service_request_model.dart'; import 'package:test_sa/models/service_request/service_request.dart'; import 'package:test_sa/new_views/common_widgets/default_app_bar.dart'; +import 'package:test_sa/service_request_latest/views/service_request_detail_main_view.dart'; import 'package:test_sa/views/pages/user/requests/service_request_details.dart'; import 'package:test_sa/views/widgets/sound/sound_player.dart'; @@ -64,10 +65,7 @@ class PendingServiceRequestScreen extends StatelessWidget { ], ), ).onPress(() { - Navigator.of(context).push(MaterialPageRoute( - builder: (_) => ServiceRequestDetailsPage( - serviceRequest: ServiceRequest(id: pendingAssetServiceRequest.details![index].id.toString()), - ))); + Navigator.of(context).push(MaterialPageRoute(builder: (_) => ServiceRequestDetailMain(requestId: pendingAssetServiceRequest.details![index].id ?? 0))); }))); } } diff --git a/lib/views/pages/user/requests/service_request_details.dart b/lib/views/pages/user/requests/service_request_details.dart index 82ac923b..ba3196bd 100644 --- a/lib/views/pages/user/requests/service_request_details.dart +++ b/lib/views/pages/user/requests/service_request_details.dart @@ -1,3 +1,5 @@ + +//TODO old Flow .. import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; import 'package:test_sa/controllers/providers/api/comments_provider.dart'; @@ -14,7 +16,6 @@ import 'package:test_sa/new_views/app_style/app_color.dart'; import 'package:test_sa/new_views/common_widgets/app_filled_button.dart'; import 'package:test_sa/new_views/common_widgets/default_app_bar.dart'; import 'package:test_sa/views/pages/user/requests/comments_bottom_sheet.dart'; -import 'package:test_sa/views/pages/user/requests/update_service_request_page.dart'; import 'package:test_sa/views/pages/user/requests/work_order/work_orders_list_page.dart'; import 'package:test_sa/views/widgets/images/files_list.dart'; import 'package:test_sa/views/widgets/loaders/app_loading.dart';