diff --git a/lib/controllers/providers/api/all_requests_provider.dart b/lib/controllers/providers/api/all_requests_provider.dart index 29dca48b..5036ea9c 100644 --- a/lib/controllers/providers/api/all_requests_provider.dart +++ b/lib/controllers/providers/api/all_requests_provider.dart @@ -140,6 +140,7 @@ class AllRequestsProvider extends ChangeNotifier { } if (context.userProvider.isQualityUser) { list = [10, 11]; + if (context.settingProvider.isUserFlowMedical) list.insert(0, 7); return list; } diff --git a/lib/dashboard_latest/dashboard_provider.dart b/lib/dashboard_latest/dashboard_provider.dart index 8853589a..f1a92f54 100644 --- a/lib/dashboard_latest/dashboard_provider.dart +++ b/lib/dashboard_latest/dashboard_provider.dart @@ -377,6 +377,13 @@ class CategoryTabs { return tabs; } + if (userType == UsersTypes.qualityUser) { + tabs.add(CategoryTabs(label: 'Open', tag: 1, id: 2)); + tabs.add(CategoryTabs(label: 'In Progress', tag: 2, id: 3)); + tabs.add(CategoryTabs(label: 'Closed', tag: 3, id: 4)); + return tabs; + } + tabs.add(CategoryTabs(label: 'Open', tag: 1, id: 2)); tabs.add(CategoryTabs(label: 'In Progress', tag: 2, id: 3)); tabs.add(CategoryTabs(label: 'Pending Acknowledgement', tag: 3, id: 1)); diff --git a/lib/dashboard_latest/widgets/progress_fragment.dart b/lib/dashboard_latest/widgets/progress_fragment.dart index a56f54e6..4ab32aab 100644 --- a/lib/dashboard_latest/widgets/progress_fragment.dart +++ b/lib/dashboard_latest/widgets/progress_fragment.dart @@ -182,6 +182,13 @@ class ProgressFragment extends StatelessWidget { ChartData('Open', snapshot.dashboardCount?.data?.countOpen?.toDouble() ?? 0.0, AppColor.blueStatus(context)), ChartData('In Progress', snapshot.dashboardCount?.data?.countInprogress?.toDouble() ?? 0.0, AppColor.orange70), ]; + } else if (_userProvider.isQualityUser) { + total = (snapshot.dashboardCount?.data?.countComplete ?? 0) + (snapshot.dashboardCount?.data?.countInprogress ?? 0) + (snapshot.dashboardCount?.data?.countOpen ?? 0); + chartData = [ + ChartData('Closed', snapshot.dashboardCount?.data?.countComplete?.toDouble() ?? 0.0, AppColor.green70), + ChartData('Open', snapshot.dashboardCount?.data?.countOpen?.toDouble() ?? 0.0, AppColor.blueStatus(context)), + ChartData('In Progress', snapshot.dashboardCount?.data?.countInprogress?.toDouble() ?? 0.0, AppColor.orange70), + ]; } else { total = (snapshot.dashboardCount?.data?.countComplete ?? 0) + (snapshot.dashboardCount?.data?.countInprogress ?? 0) + (snapshot.dashboardCount?.data?.countOpen ?? 0); chartData = [ @@ -248,7 +255,7 @@ class ProgressFragment extends StatelessWidget { showChartValuesOutside: false, decimalPlaces: 1, ), - ).toShimmer(isShow: snapshot.isAllCountLoading, radius: 250,context: context).paddingAll(0).toShadowContainer(context), + ).toShimmer(isShow: snapshot.isAllCountLoading, radius: 250, context: context).paddingAll(0).toShadowContainer(context), ], ), ), diff --git a/lib/models/user.dart b/lib/models/user.dart index 2fd42598..5eac8486 100644 --- a/lib/models/user.dart +++ b/lib/models/user.dart @@ -110,6 +110,8 @@ class User { return UsersTypes.assessorTl; case "R-3": // Quality User return UsersTypes.qualityUser; + case "R-58": // Quality User + return UsersTypes.qualityUser; default: return null; } diff --git a/lib/modules/internal_audit_module/models/equipment_internal_audit_data_model.dart b/lib/modules/internal_audit_module/models/equipment_internal_audit_data_model.dart index 92f41bab..1e62dd1d 100644 --- a/lib/modules/internal_audit_module/models/equipment_internal_audit_data_model.dart +++ b/lib/modules/internal_audit_module/models/equipment_internal_audit_data_model.dart @@ -170,6 +170,8 @@ class Asset { String? siteName; int? siteId; String? modelDefinition; + int? departmentId; + String? departmentName; Asset({ this.id, @@ -181,6 +183,8 @@ class Asset { this.siteName, this.siteId, this.modelDefinition, + this.departmentId, + this.departmentName, }); Asset.fromJson(Map json) { @@ -193,6 +197,8 @@ class Asset { siteName = json['siteName']; siteId = json['siteId']; modelDefinition = json['modelDefinition']; + departmentId = json['departmentId']; + departmentName = json['departmentName']; } Map toJson() { @@ -206,6 +212,8 @@ class Asset { data['siteName'] = siteName; data['siteId'] = siteId; data['modelDefinition'] = modelDefinition; + data['departmentId'] = departmentId; + data['departmentName'] = departmentName; return data; } } diff --git a/lib/modules/internal_audit_module/pages/equipment_internal_audit/equipment_internal_audit_detail_page.dart b/lib/modules/internal_audit_module/pages/equipment_internal_audit/equipment_internal_audit_detail_page.dart index 796a401d..74903c92 100644 --- a/lib/modules/internal_audit_module/pages/equipment_internal_audit/equipment_internal_audit_detail_page.dart +++ b/lib/modules/internal_audit_module/pages/equipment_internal_audit/equipment_internal_audit_detail_page.dart @@ -217,8 +217,8 @@ class _EquipmentInternalAuditDetailPageState extends State EquipmentInternalAuditDetailPage(auditId: requestDetails!.id!))); + Navigator.push(context, MaterialPageRoute(builder: (context) => EquipmentInternalAuditDetailPage(auditId: requestData!.id!))); }); } return Column( diff --git a/lib/modules/internal_audit_module/pages/system_internal_audit/system_internal_audit_item_view.dart b/lib/modules/internal_audit_module/pages/system_internal_audit/system_internal_audit_item_view.dart index 37b510c8..91a01b22 100644 --- a/lib/modules/internal_audit_module/pages/system_internal_audit/system_internal_audit_item_view.dart +++ b/lib/modules/internal_audit_module/pages/system_internal_audit/system_internal_audit_item_view.dart @@ -61,7 +61,7 @@ class SystemInternalAuditItemView extends StatelessWidget { ), ], ).toShadowContainer(context, withShadow: showShadow).onPress(() async { - Navigator.push(context, MaterialPageRoute(builder: (context) => SystemInternalAuditDetailPage(auditId: requestDetails!.id!))); + Navigator.push(context, MaterialPageRoute(builder: (context) => SystemInternalAuditDetailPage(auditId: requestData!.id!))); }); } return Column( diff --git a/lib/modules/loan_module/pages/create_loan_request_page.dart b/lib/modules/loan_module/pages/create_loan_request_page.dart index 734b39c5..fe76e39b 100644 --- a/lib/modules/loan_module/pages/create_loan_request_page.dart +++ b/lib/modules/loan_module/pages/create_loan_request_page.dart @@ -121,18 +121,16 @@ class _CreateLoanRequestPageState extends State with Tick ), 16.height, ], + ...doctorInfoSection(), // ...contactInfoSection(), - // 16.height, - ...itemDetailsSection(), 16.height, - ...doctorInfoSection(), + ...itemDetailsSection(), 16.height, ...vendorDetailsSection(), 16.height, AttachmentPicker( label: context.translation.attachments, attachment: attachments, - buttonColor: AppColor.black10, onlyImages: false, showAsListView: true, buttonIcon: 'image-plus'.toSvgAsset(color: context.isDark ? AppColor.primary10 : AppColor.neutral120), diff --git a/lib/new_views/pages/land_page/my_request/all_requests_filter_page.dart b/lib/new_views/pages/land_page/my_request/all_requests_filter_page.dart index 26076417..ea9963d2 100644 --- a/lib/new_views/pages/land_page/my_request/all_requests_filter_page.dart +++ b/lib/new_views/pages/land_page/my_request/all_requests_filter_page.dart @@ -102,7 +102,9 @@ class _AllRequestsFilterPageState extends State { types = {"TRAF": 9}; } if (context.userProvider.isQualityUser) { - types = {'Equipment Internal Audit': 10, 'System Internal Audit': 11}; + if (context.settingProvider.isUserFlowMedical) types = {'Recall and Alert': 7}; + types['Equipment Internal Audit'] = 10; + types['System Internal Audit'] = 11; } final statuses = { 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 7f75b6bc..0d96c648 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 @@ -80,6 +80,7 @@ class _MyRequestsPageState extends State { if (context.userProvider.isQualityUser) { requestsList = [ Request(null, context.translation.allWorkOrder), + if (context.settingProvider.isUserFlowMedical) Request(7, 'Recall and Alert'), Request(10, 'Equipment Internal Audit'), Request(11, 'System Internal Audit'), ];