diff --git a/lib/modules/demo_module/demo_detail_view_page.dart b/lib/modules/demo_module/demo_detail_view_page.dart index 20be2563..ef054f4f 100644 --- a/lib/modules/demo_module/demo_detail_view_page.dart +++ b/lib/modules/demo_module/demo_detail_view_page.dart @@ -98,11 +98,11 @@ class _DemoDetailViewPageState extends State { children: [ if (demoData.status != null) ...[ StatusLabel( - label: demoData.status?.name, + label: context.userProvider.isNurse ? demoData.endUserStatus?.name : demoData.status?.name, id: demoData.status?.value, radius: 4, - textColor: AppColor.demoRequestStatusTextColor(context, demoData.status!.value!), - backgroundColor: AppColor.demoRequestStatus(context, demoData.status!.value!), + textColor: AppColor.demoRequestStatusTextColor(context, context.userProvider.isNurse ? demoData.endUserStatus!.value! : demoData.status!.value!), + backgroundColor: AppColor.demoRequestStatus(context, context.userProvider.isNurse ? demoData.endUserStatus!.value! : demoData.status!.value!), ), 8.height, ], diff --git a/lib/modules/demo_module/models/demo_request_model.dart b/lib/modules/demo_module/models/demo_request_model.dart index f79c06a8..a1e1e734 100644 --- a/lib/modules/demo_module/models/demo_request_model.dart +++ b/lib/modules/demo_module/models/demo_request_model.dart @@ -28,6 +28,7 @@ class DemoRequestModel { SupplierDetails? supplier; SuppEngineerWorkOrders? suppPerson; Lookup? status; + Lookup? endUserStatus; List? demoAttachments; List? supplierDemoAttachments; dynamic demoAsset; @@ -58,6 +59,7 @@ class DemoRequestModel { this.supplier, this.suppPerson, this.status, + this.endUserStatus, this.demoAttachments, this.supplierDemoAttachments, this.demoAsset, @@ -89,6 +91,7 @@ class DemoRequestModel { supplier = json['supplier'] != null ? (SupplierDetails.fromJson(json['supplier'])) : null; suppPerson = json['suppPerson'] != null ? (SuppEngineerWorkOrders.fromJson(json['suppPerson'])) : null; status = json['status'] != null ? (Lookup.fromJson(json['status'])) : null; + endUserStatus = json['endUserStatus'] != null ? (Lookup.fromJson(json['endUserStatus'])) : null; demoAttachments = json['demoAttachments'] != null ? (json['demoAttachments'] as List).map((e) => DemoAttachments.fromJson(e)).toList() : null; supplierDemoAttachments = json['supplierDemoAttachments'] != null ? (json['supplierDemoAttachments'] as List).map((e) => DemoAttachments.fromJson(e)).toList() : null; demoAsset = json['demoAsset'];