From 542070c7913f9442530f6e14e788f4056b2e8a8c Mon Sep 17 00:00:00 2001 From: WaseemAbbasi22 Date: Wed, 19 Nov 2025 11:24:04 +0300 Subject: [PATCH] improvements --- lib/models/user.dart | 6 ++---- .../update_equipment_internal_audit_page.dart | 1 + .../update_system_internal_audit_page.dart | 2 ++ .../land_page/my_request/all_requests_filter_page.dart | 8 +++++--- lib/views/widgets/timer/app_timer.dart | 5 ++++- 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/lib/models/user.dart b/lib/models/user.dart index 2c4f3e19..de6f88b8 100644 --- a/lib/models/user.dart +++ b/lib/models/user.dart @@ -98,8 +98,6 @@ class User { UsersTypes? get type { switch (userRoles?.first.value) { - case "R-7": // Head Nurse Role - return UsersTypes.qualityUser; case "R-6": return UsersTypes.engineer; case "R-7": // Nurse Role @@ -110,8 +108,8 @@ class User { return UsersTypes.assessor; case "R-19": // Head Nurse Role return UsersTypes.assessorTl; - //TODO need to replace with actual data when confirm - + case "R-3": // Quality User + return UsersTypes.qualityUser; default: return null; } diff --git a/lib/modules/internal_audit_module/pages/equipment_internal_audit/update_equipment_internal_audit_page.dart b/lib/modules/internal_audit_module/pages/equipment_internal_audit/update_equipment_internal_audit_page.dart index e5d3072f..f69e4a10 100644 --- a/lib/modules/internal_audit_module/pages/equipment_internal_audit/update_equipment_internal_audit_page.dart +++ b/lib/modules/internal_audit_module/pages/equipment_internal_audit/update_equipment_internal_audit_page.dart @@ -292,6 +292,7 @@ class _UpdateEquipmentInternalAuditPageState extends State { if (isEngineer) { types[context.translation.recurrentWo] = 5; - types["Internal Audit".addTranslation] = 10; + types["Equipment Internal Audit".addTranslation] = 10; + types["System Internal Audit".addTranslation] = 11; } if (context.settingProvider.isUserFlowMedical) { @@ -83,8 +84,9 @@ class _AllRequestsFilterPageState extends State { if (context.userProvider.isAssessor) { types = {"TRAF": 9}; - }if (context.userProvider.isQualityUser) { - types = {"Internal Audit": 10}; + } + if (context.userProvider.isQualityUser) { + types = {'Equipment Internal Audit': 10, 'System Internal Audit': 11}; } final statuses = { diff --git a/lib/views/widgets/timer/app_timer.dart b/lib/views/widgets/timer/app_timer.dart index 84179d92..629ad60c 100644 --- a/lib/views/widgets/timer/app_timer.dart +++ b/lib/views/widgets/timer/app_timer.dart @@ -22,6 +22,7 @@ class AppTimer extends StatefulWidget { final TextStyle? style; final BoxDecoration? decoration; final bool enabled; + final bool showPicker; final String? label; final double? width; @@ -40,6 +41,7 @@ class AppTimer extends StatefulWidget { this.onPick, this.timerProgress, this.enabled = true, + this.showPicker = true, }) : super(key: key); @override @@ -126,7 +128,8 @@ class _AppTimerState extends State { @override void initState() { - canPickTime = ApiManager.instance.assetGroup?.enabledEngineerTimer ?? false; + ///this is temp check for internal audit + canPickTime = widget.showPicker == false ? false : ApiManager.instance.assetGroup?.enabledEngineerTimer ?? false; _startAt = widget.timer?.startAt; _endAt = widget.timer?.endAt; _running = _startAt != null && _endAt == null;