diff --git a/lib/service_request_latest/request_detail_provider.dart b/lib/service_request_latest/request_detail_provider.dart index b4114a9c..3dd8281b 100644 --- a/lib/service_request_latest/request_detail_provider.dart +++ b/lib/service_request_latest/request_detail_provider.dart @@ -353,7 +353,6 @@ class RequestDetailProvider extends ChangeNotifier { }; isLoading = true; final response = await ApiManager.instance.post(URLs.assignEngineerToWorkOrderUrl, body: body); - final response = await ApiManager.instance.post(URLs.assignEngineerToWorkOrderUrl, body: body); stateCode = response.statusCode; if (response.statusCode >= 200 && response.statusCode < 300) { CommonResponseModel commonResponseModel = CommonResponseModel.fromJson(json.decode(response.body)); diff --git a/lib/service_request_latest/views/components/action_button/footer_action_button.dart b/lib/service_request_latest/views/components/action_button/footer_action_button.dart index 0df361f6..633a7d10 100644 --- a/lib/service_request_latest/views/components/action_button/footer_action_button.dart +++ b/lib/service_request_latest/views/components/action_button/footer_action_button.dart @@ -1,165 +1,141 @@ 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/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/new_views/common_widgets/app_filled_button.dart'; import 'package:test_sa/service_request_latest/views/components/bottom_sheets/service_request_bottomsheet.dart'; -class FooterActionButton { - - static Widget footerContainer({required Widget child}){ +class FooterActionButton { + static Widget footerContainer({required Widget child}) { return Align( alignment: Alignment.bottomCenter, child: Container( - padding: EdgeInsets.symmetric(horizontal: 16.toScreenWidth,vertical: 16.toScreenHeight), + padding: EdgeInsets.symmetric(horizontal: 16.toScreenWidth, vertical: 16.toScreenHeight), color: AppColor.white10, child: child, ), ); } - static Widget requestDetailsFooterWidget({required int status,required BuildContext context}){ - switch(status){ + static Widget requestDetailsFooterWidget({required int status, required BuildContext context}) { + switch (status) { //accept reject... case 1: return footerContainer( - child: - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - mainAxisSize: MainAxisSize.min, - children: [ - AppFilledButton( - label: context.translation.reject, - maxWidth: true, - buttonColor: Colors.white54, - textColor: AppColor.red30, - showBorder: true, - onPressed: () async { - ServiceRequestBottomSheet.rejectRequestBottomSheet(context: context); - }, - ).expanded, - const SizedBox( - width: 20, - ), - AppFilledButton( - label: context.translation.accept, - maxWidth: true, - buttonColor: AppColor.green70, - onPressed: () async { - }, - ).expanded, - ], - ) - ); - break; - //need visit fixed remotely - case 2: - return footerContainer( - child: - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - mainAxisSize: MainAxisSize.min, - children: [ - AppFilledButton( - label: context.translation.needAVisit, - maxWidth: true, - buttonColor: AppColor.neutral50, - onPressed: () async { - ServiceRequestBottomSheet.initialVisitBottomSheet(context: context); - }, - ).expanded, - const SizedBox( - width: 20, - ), - AppFilledButton( - label: context.translation.fixedRemotely, - maxWidth: true, - buttonColor: AppColor.green70, - onPressed: () async { - ServiceRequestBottomSheet.fixRemotelyBottomSheet(context: context); - }, - ).expanded, - ], - ) - ); - break; - //verify Asset Details - case 3: - return footerContainer( - child: + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + mainAxisSize: MainAxisSize.min, + children: [ AppFilledButton( - label: context.translation.verify_asset_details, - // maxWidth: true, - buttonColor: AppColor.primary10, + label: context.translation.reject, + maxWidth: true, + buttonColor: Colors.white54, + textColor: AppColor.red30, + showBorder: true, onPressed: () async { - + ServiceRequestBottomSheet.rejectRequestBottomSheet(context: context); }, - ) - ); + ).expanded, + const SizedBox( + width: 20, + ), + AppFilledButton( + label: context.translation.accept, + maxWidth: true, + buttonColor: AppColor.green70, + onPressed: () async {}, + ).expanded, + ], + )); break; - //Activities - case 4: + //need visit fixed remotely + case 2: return footerContainer( - child: + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + mainAxisSize: MainAxisSize.min, + children: [ AppFilledButton( - label: context.translation.activities, - // maxWidth: true, + label: context.translation.needAVisit, + maxWidth: true, buttonColor: AppColor.neutral50, onPressed: () async { - ServiceRequestBottomSheet.activityTypeBottomSheet(context: context); + ServiceRequestBottomSheet.initialVisitBottomSheet(context: context); }, - ) - ); - break; - //I have arrived... - case 5: - return footerContainer( - child: + ).expanded, + const SizedBox( + width: 20, + ), AppFilledButton( - label: context.translation.iHaveArrived, - //showIcon: true, - // icon: 'arrived_icon'.toSvgAsset(), + label: context.translation.fixedRemotely, + maxWidth: true, buttonColor: AppColor.green70, onPressed: () async { - + ServiceRequestBottomSheet.fixRemotelyBottomSheet(context: context); }, - ) - ); + ).expanded, + ], + )); break; - //Close.. - case 6: + //verify Asset Details + case 3: return footerContainer( - child: - AppFilledButton( - label: context.translation.close, - // maxWidth: true, - buttonColor: AppColor.primary10, - onPressed: () async { - - }, - ) - ); + child: AppFilledButton( + label: context.translation.verify_asset_details, + // maxWidth: true, + buttonColor: AppColor.primary10, + onPressed: () async {}, + )); break; - //for nurse to take action... - case 7: + //Activities + case 4: return footerContainer( - child: - AppFilledButton( - label: context.translation.takeAction, - // maxWidth: true, - buttonColor: AppColor.primary10, - onPressed: () async { - ServiceRequestBottomSheet.nurseTakeActionBottomSheet(context: context); - }, - ) - ); + child: AppFilledButton( + label: context.translation.activities, + // maxWidth: true, + buttonColor: AppColor.neutral50, + onPressed: () async { + ServiceRequestBottomSheet.activityTypeBottomSheet(context: context); + }, + )); + break; + //I have arrived... + case 5: + return footerContainer( + child: AppFilledButton( + label: context.translation.iHaveArrived, + //showIcon: true, + // icon: 'arrived_icon'.toSvgAsset(), + buttonColor: AppColor.green70, + onPressed: () async {}, + )); + break; + //Close.. + case 6: + return footerContainer( + child: AppFilledButton( + label: context.translation.close, + // maxWidth: true, + buttonColor: AppColor.primary10, + onPressed: () async {}, + )); + break; + //for nurse to take action... + case 7: + return footerContainer( + child: AppFilledButton( + label: context.translation.takeAction, + // maxWidth: true, + buttonColor: AppColor.primary10, + onPressed: () async { + ServiceRequestBottomSheet.nurseTakeActionBottomSheet(context: context); + }, + )); break; default: return const SizedBox(); } - } } diff --git a/lib/service_request_latest/views/components/request_detail_view.dart b/lib/service_request_latest/views/components/request_detail_view.dart index 2787211b..d3c7e5d5 100644 --- a/lib/service_request_latest/views/components/request_detail_view.dart +++ b/lib/service_request_latest/views/components/request_detail_view.dart @@ -19,9 +19,6 @@ import 'package:test_sa/service_request_latest/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/initial_visit_card.dart'; import 'package:test_sa/service_request_latest/views/components/timer_widget.dart'; -import 'package:test_sa/service_request_latest/views/forms/asset_retired/asset_retired.dart'; -import 'package:test_sa/service_request_latest/views/forms/asset_retired/verify_asset_detail.dart'; -import 'package:test_sa/service_request_latest/views/forms/maintenance_request/maintenance_request_main.dart'; import 'package:test_sa/service_request_latest/views/nurse/create_new_request_view.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'; @@ -30,7 +27,7 @@ import 'package:test_sa/views/widgets/loaders/app_loading.dart'; import 'package:test_sa/views/widgets/loaders/no_data_found.dart'; import 'package:test_sa/views/widgets/requests/request_status.dart'; import 'package:test_sa/views/widgets/sound/sound_player.dart'; -import '../forms/spare_part/spare_part_request.dart'; + class WorkOrderDetailView extends StatelessWidget { WorkOrderDetailView({Key? key}) : super(key: key); @@ -63,7 +60,7 @@ class WorkOrderDetailView extends StatelessWidget { ], ), ).expanded, - FooterActionButton.footerWidget(status: 1, context: context), + FooterActionButton.requestDetailsFooterWidget(status: 1, context: context), ], ), const TimerWidget(), @@ -312,8 +309,6 @@ class _RequestDetailViewState extends State { }); } - - @override Widget build(BuildContext context) { UserProvider _userProvider = Provider.of(context, listen: false); @@ -334,7 +329,6 @@ class _RequestDetailViewState extends State { } Widget requestDetailCard({required ServiceRequestsProvider serviceRequestsProvider, required UserProvider userProvider}) { - return SafeArea( child: serviceRequestsProvider.isDetialLoading ? const ALoading().center @@ -584,7 +578,7 @@ class _RequestDetailViewState extends State { showBorder: true, onPressed: () async { // Navigator.push(context, MaterialPageRoute(builder: (context) => AssetRetired())); - Navigator.push(context, MaterialPageRoute(builder: (context) => const CreateNewRequest())); + Navigator.push(context, MaterialPageRoute(builder: (context) => CreateNewRequest())); }), ); } diff --git a/lib/service_request_latest/views/request_detail_main_view.dart b/lib/service_request_latest/views/request_detail_main_view.dart index 5e6a7249..c7e3578f 100644 --- a/lib/service_request_latest/views/request_detail_main_view.dart +++ b/lib/service_request_latest/views/request_detail_main_view.dart @@ -1,22 +1,18 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import 'package:test_sa/dashboard_latest/dashboard_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/service_request/service_request.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/request_detail_provider.dart'; import 'package:test_sa/service_request_latest/views/components/history_log_view.dart'; -import 'package:test_sa/service_request_latest/views/components/initial_visit_card.dart'; import 'components/request_detail_view.dart'; class RequestDetailMain extends StatefulWidget { final int requestId; - const RequestDetailMain({Key? key, required this.requestId}) : super(key: key); RequestDetailMain({Key? key, required this.requestId}) : super(key: key); @@ -77,7 +73,7 @@ class _RequestDetailMainState extends State { ), ), 12.height, - TabBarView( + TabBarView( children: [ WorkOrderDetailView(), // RequestDetailView(