diff --git a/lib/modules/cm_module/views/components/action_button/footer_action_button.dart b/lib/modules/cm_module/views/components/action_button/footer_action_button.dart index b9935e7a..151d5a35 100644 --- a/lib/modules/cm_module/views/components/action_button/footer_action_button.dart +++ b/lib/modules/cm_module/views/components/action_button/footer_action_button.dart @@ -438,6 +438,49 @@ class FooterActionButton { }, ), ); + case DemoRequestStepEnum.submitEvaluation: + // return const SizedBox(); + // return footerContainer( + // context: context, + // child: AppFilledButton( + // label: 'Submit Evaluation'.addTranslation, + // // maxWidth: true, + // buttonColor: AppColor.primary10, + // onPressed: () async { + // bool? isRefresh = await Navigator.push(context, MaterialPageRoute(builder: (context) => EvaluationFormPage())); + // if (isRefresh == true) { + // refreshData(); + // } + // }, + // ), + // ); + case DemoRequestStepEnum.viewOnly: + return const SizedBox(); + case DemoRequestStepEnum.extendDemoPeriod: + return footerContainer( + context: context, + child: AppFilledButton( + buttonColor: AppColor.primary10, + label: "Extension Request", + onPressed: () async { + final bool? isRefresh = await showModalBottomSheet( + context: context, + useSafeArea: true, + backgroundColor: Colors.transparent, + isScrollControlled: true, + builder: (_) => DemoExtensionBottomSheet( + requestId: dataModel.id!, + ), + ); + if (isRefresh == true) { + refreshData(); + } + }, + ), + ); + } + } else if (userProvider.user?.type == UsersTypes.normal_user) { + switch (demoRequestStage) { case DemoRequestStepEnum.submitEvaluation: return footerContainer( context: context, @@ -455,6 +498,10 @@ class FooterActionButton { ); case DemoRequestStepEnum.viewOnly: return const SizedBox(); + case DemoRequestStepEnum.qAuditorRejectAccept: + return const SizedBox(); + case DemoRequestStepEnum.updateRequest: + return const SizedBox(); case DemoRequestStepEnum.extendDemoPeriod: return footerContainer( context: context, diff --git a/lib/modules/tm_module/tasks/task_request_detail_view.dart b/lib/modules/tm_module/tasks/task_request_detail_view.dart index 8d23e461..ab5edf65 100644 --- a/lib/modules/tm_module/tasks/task_request_detail_view.dart +++ b/lib/modules/tm_module/tasks/task_request_detail_view.dart @@ -177,7 +177,10 @@ class _TaskRequestDetailsViewState extends State { ], ).toShadowContainer(context).paddingAll(16), ).expanded, - if (context.settingProvider.isUserFlowMedical && userProvider!.user!.type == UsersTypes.engineer && (taskModel?.taskJobStatus?.value == 1)) + if (taskProvider.taskRequestModel?.taskType?.isRecallAndAlert == false && + context.settingProvider.isUserFlowMedical && + userProvider!.user!.type == UsersTypes.engineer && + (taskModel?.taskJobStatus?.value == 1)) FooterActionButton.footerContainer( context: context, child: AppFilledButton( @@ -191,7 +194,9 @@ class _TaskRequestDetailsViewState extends State { ) else if (userProvider!.user!.type == UsersTypes.engineer && taskModel?.taskJobStatus?.value == 5) ...[] - else if (userProvider!.user!.type == UsersTypes.engineer && (taskModel?.taskJobStatus?.value != 4 && taskModel?.taskJobStatus?.value != 3)) + else if (userProvider!.user!.type == UsersTypes.engineer && (taskModel?.taskJobStatus?.value != 4 && taskModel?.taskJobStatus?.value != 3 + && taskModel?.taskJobStatus?.value != 1 + )) FooterActionButton.footerContainer( context: context, child: Row( 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 f49ff87c..a02acdbc 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 @@ -81,7 +81,7 @@ class _MyRequestsPageState extends State { requestsList = [ Request(null, context.translation.allWorkOrder), Request(9, 'TRAF'), - Request(15, 'Demo Request'), + Request(15, 'Demo'), ]; } if (context.userProvider.isCommissioningEngineer && context.settingProvider.isUserFlowMedical) {