diff --git a/lib/extensions/enum_extensions.dart b/lib/extensions/enum_extensions.dart index 23a066f5..c89835a5 100644 --- a/lib/extensions/enum_extensions.dart +++ b/lib/extensions/enum_extensions.dart @@ -121,8 +121,8 @@ extension IntExtensionsDemoRequest on int { case 5: return DemoRequestStepEnum.qAuditorRejectAccept; - case 7: - return DemoRequestStepEnum.qAuditorRejectAccept; + // case 7: + // return DemoRequestStepEnum.qAuditorRejectAccept; case 5: return DemoRequestStepEnum.updateRequest; diff --git a/lib/modules/demo_module/demo_detail_view_page.dart b/lib/modules/demo_module/demo_detail_view_page.dart index b0a255b0..27db8ba8 100644 --- a/lib/modules/demo_module/demo_detail_view_page.dart +++ b/lib/modules/demo_module/demo_detail_view_page.dart @@ -188,7 +188,8 @@ class _DemoDetailViewPageState extends State { List requestDetails(BuildContext context, DemoRequestModel? model) { return [ Text("Request Details", style: AppTextStyles.heading6.copyWith(color: context.isDark ? AppColor.neutral30 : AppColor.neutral50)), - // 'Demo No: ${model. ?? "-"}'.bodyText(context), + 'Request No: ${model?.requestNo ?? "-"}'.bodyText(context), + 'Demo No: ${model?.demoNo ?? "-"}'.bodyText(context), 'Demo Period: ${model?.demoPeriod?.name ?? "-"}'.bodyText(context), '${context.translation.site}: ${model?.site?.custName ?? "-"}'.bodyText(context), '${context.translation.building}: ${model?.building?.name ?? "-"}'.bodyText(context), diff --git a/lib/modules/demo_module/models/demo_request_model.dart b/lib/modules/demo_module/models/demo_request_model.dart index a1e1e734..2c07f111 100644 --- a/lib/modules/demo_module/models/demo_request_model.dart +++ b/lib/modules/demo_module/models/demo_request_model.dart @@ -35,6 +35,8 @@ class DemoRequestModel { dynamic demoInstallationTaskJob; dynamic demoPullOutTaskJob; bool? isDemoPeriodExpired; + String? requestNo; + String? demoNo; DemoRequestModel({ this.id, @@ -66,6 +68,8 @@ class DemoRequestModel { this.demoInstallationTaskJob, this.demoPullOutTaskJob, this.isDemoPeriodExpired, + this.requestNo, + this.demoNo, }); DemoRequestModel.fromJson(Map json) { @@ -98,6 +102,8 @@ class DemoRequestModel { demoInstallationTaskJob = json['demoInstallationTaskJob']; demoPullOutTaskJob = json['demoPullOutTaskJob']; isDemoPeriodExpired = json['isDemoPeriodExpired']; + requestNo = json['requestNo']; + demoNo = json['demoNo']; } Map toJson() { @@ -112,6 +118,8 @@ class DemoRequestModel { "itemDescription": itemDescription, "requestDescription": requestDescription, "model": model, + "requestNo": requestNo, + "demoNo": demoNo, "manufacturer": manufacturer, "demoPeriodId": demoPeriod?.id, "supplierId": supplier?.id,