improvements

design_3.0_demo_module
WaseemAbbasi22 4 months ago
parent a04ae0c833
commit 542070c791

@ -98,8 +98,6 @@ class User {
UsersTypes? get type { UsersTypes? get type {
switch (userRoles?.first.value) { switch (userRoles?.first.value) {
case "R-7": // Head Nurse Role
return UsersTypes.qualityUser;
case "R-6": case "R-6":
return UsersTypes.engineer; return UsersTypes.engineer;
case "R-7": // Nurse Role case "R-7": // Nurse Role
@ -110,8 +108,8 @@ class User {
return UsersTypes.assessor; return UsersTypes.assessor;
case "R-19": // Head Nurse Role case "R-19": // Head Nurse Role
return UsersTypes.assessorTl; return UsersTypes.assessorTl;
//TODO need to replace with actual data when confirm case "R-3": // Quality User
return UsersTypes.qualityUser;
default: default:
return null; return null;
} }

@ -292,6 +292,7 @@ class _UpdateEquipmentInternalAuditPageState extends State<UpdateEquipmentIntern
timer: formModel.auditTimerModel, timer: formModel.auditTimerModel,
pickerFromDate: DateTime.tryParse(widget.model?.createdDate ?? ''), pickerFromDate: DateTime.tryParse(widget.model?.createdDate ?? ''),
pickerTimer: formModel.auditTimePicker, pickerTimer: formModel.auditTimePicker,
showPicker: false,
onPick: (timer) { onPick: (timer) {
updateTimer(timer: timer); updateTimer(timer: timer);
}, },

@ -261,6 +261,7 @@ class _UpdateSystemInternalAuditPageState extends State<UpdateSystemInternalAudi
return Column( return Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
///this is for multiple timers...
// AppTimer( // AppTimer(
// label: context.translation.timer, // label: context.translation.timer,
// timer: formModel.auditTimerModel, // timer: formModel.auditTimerModel,
@ -282,6 +283,7 @@ class _UpdateSystemInternalAuditPageState extends State<UpdateSystemInternalAudi
// ), // ),
AppTimer( AppTimer(
label: context.translation.workingHours, label: context.translation.workingHours,
showPicker: false,
timer: formModel.auditTimerModel, timer: formModel.auditTimerModel,
pickerFromDate: DateTime.tryParse(widget.model?.createdDate ?? ''), pickerFromDate: DateTime.tryParse(widget.model?.createdDate ?? ''),
pickerTimer: formModel.auditTimePicker, pickerTimer: formModel.auditTimePicker,

@ -70,7 +70,8 @@ class _AllRequestsFilterPageState extends State<AllRequestsFilterPage> {
if (isEngineer) { if (isEngineer) {
types[context.translation.recurrentWo] = 5; 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) { if (context.settingProvider.isUserFlowMedical) {
@ -83,8 +84,9 @@ class _AllRequestsFilterPageState extends State<AllRequestsFilterPage> {
if (context.userProvider.isAssessor) { if (context.userProvider.isAssessor) {
types = {"TRAF": 9}; 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 = { final statuses = {

@ -22,6 +22,7 @@ class AppTimer extends StatefulWidget {
final TextStyle? style; final TextStyle? style;
final BoxDecoration? decoration; final BoxDecoration? decoration;
final bool enabled; final bool enabled;
final bool showPicker;
final String? label; final String? label;
final double? width; final double? width;
@ -40,6 +41,7 @@ class AppTimer extends StatefulWidget {
this.onPick, this.onPick,
this.timerProgress, this.timerProgress,
this.enabled = true, this.enabled = true,
this.showPicker = true,
}) : super(key: key); }) : super(key: key);
@override @override
@ -126,7 +128,8 @@ class _AppTimerState extends State<AppTimer> {
@override @override
void initState() { 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; _startAt = widget.timer?.startAt;
_endAt = widget.timer?.endAt; _endAt = widget.timer?.endAt;
_running = _startAt != null && _endAt == null; _running = _startAt != null && _endAt == null;

Loading…
Cancel
Save