improvement

design_3.0_demo_module
Sikander Saleem 17 hours ago
parent 2e3736cdc9
commit 7020b9b36e

@ -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<bool>(
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,

@ -177,7 +177,10 @@ class _TaskRequestDetailsViewState extends State<TaskRequestDetailsView> {
],
).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<TaskRequestDetailsView> {
)
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(

@ -81,7 +81,7 @@ class _MyRequestsPageState extends State<MyRequestsPage> {
requestsList = [
Request(null, context.translation.allWorkOrder),
Request(9, 'TRAF'),
Request(15, 'Demo Request'),
Request(15, 'Demo'),
];
}
if (context.userProvider.isCommissioningEngineer && context.settingProvider.isUserFlowMedical) {

Loading…
Cancel
Save