uat improvements. md->department, enable recall and alert for quality user.

design_3.0_internal_audit_module
Sikander Saleem 4 weeks ago
parent db2175b7f5
commit 17210195db

@ -139,8 +139,8 @@ class AllRequestsProvider extends ChangeNotifier {
return list; return list;
} }
if (context.userProvider.isQualityUser) { if (context.userProvider.isQualityUser) {
list = [10, 11];
list = [10,11]; if (context.settingProvider.isUserFlowMedical) list.insert(0, 7);
return list; return list;
} }

@ -377,6 +377,13 @@ class CategoryTabs {
return tabs; 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: 'Open', tag: 1, id: 2));
tabs.add(CategoryTabs(label: 'In Progress', tag: 2, id: 3)); tabs.add(CategoryTabs(label: 'In Progress', tag: 2, id: 3));
tabs.add(CategoryTabs(label: 'Pending Acknowledgement', tag: 3, id: 1)); tabs.add(CategoryTabs(label: 'Pending Acknowledgement', tag: 3, id: 1));

@ -182,6 +182,13 @@ class ProgressFragment extends StatelessWidget {
ChartData('Open', snapshot.dashboardCount?.data?.countOpen?.toDouble() ?? 0.0, AppColor.blueStatus(context)), ChartData('Open', snapshot.dashboardCount?.data?.countOpen?.toDouble() ?? 0.0, AppColor.blueStatus(context)),
ChartData('In Progress', snapshot.dashboardCount?.data?.countInprogress?.toDouble() ?? 0.0, AppColor.orange70), 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 { } else {
total = (snapshot.dashboardCount?.data?.countComplete ?? 0) + (snapshot.dashboardCount?.data?.countInprogress ?? 0) + (snapshot.dashboardCount?.data?.countOpen ?? 0); total = (snapshot.dashboardCount?.data?.countComplete ?? 0) + (snapshot.dashboardCount?.data?.countInprogress ?? 0) + (snapshot.dashboardCount?.data?.countOpen ?? 0);
chartData = [ chartData = [
@ -248,7 +255,7 @@ class ProgressFragment extends StatelessWidget {
showChartValuesOutside: false, showChartValuesOutside: false,
decimalPlaces: 1, 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),
], ],
), ),
), ),

@ -170,6 +170,8 @@ class Asset {
String? siteName; String? siteName;
int? siteId; int? siteId;
String? modelDefinition; String? modelDefinition;
int? departmentId;
String? departmentName;
Asset({ Asset({
this.id, this.id,
@ -181,6 +183,8 @@ class Asset {
this.siteName, this.siteName,
this.siteId, this.siteId,
this.modelDefinition, this.modelDefinition,
this.departmentId,
this.departmentName,
}); });
Asset.fromJson(Map<String, dynamic> json) { Asset.fromJson(Map<String, dynamic> json) {
@ -193,6 +197,8 @@ class Asset {
siteName = json['siteName']; siteName = json['siteName'];
siteId = json['siteId']; siteId = json['siteId'];
modelDefinition = json['modelDefinition']; modelDefinition = json['modelDefinition'];
departmentId = json['departmentId'];
departmentName = json['departmentName'];
} }
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {
@ -206,6 +212,8 @@ class Asset {
data['siteName'] = siteName; data['siteName'] = siteName;
data['siteId'] = siteId; data['siteId'] = siteId;
data['modelDefinition'] = modelDefinition; data['modelDefinition'] = modelDefinition;
data['departmentId'] = departmentId;
data['departmentName'] = departmentName;
return data; return data;
} }
} }

@ -217,8 +217,8 @@ class _EquipmentInternalAuditDetailPageState extends State<EquipmentInternalAudi
'${context.translation.serialNumber}: ${model?.asset?.assetNumber ?? '-'}'.bodyText(context), '${context.translation.serialNumber}: ${model?.asset?.assetNumber ?? '-'}'.bodyText(context),
'${context.translation.manufacture}: ${model?.asset?.manufacturerName ?? '-'}'.bodyText(context), '${context.translation.manufacture}: ${model?.asset?.manufacturerName ?? '-'}'.bodyText(context),
'${context.translation.model}: ${model?.asset?.modelName ?? '-'}'.bodyText(context), '${context.translation.model}: ${model?.asset?.modelName ?? '-'}'.bodyText(context),
'${context.translation.md}: ${model?.asset?.modelDefinition ?? '-'}'.bodyText(context),
'${context.translation.site}: ${model?.asset?.siteName ?? '-'}'.bodyText(context), '${context.translation.site}: ${model?.asset?.siteName ?? '-'}'.bodyText(context),
'${context.translation.department}: ${model?.asset?.departmentName ?? '-'}'.bodyText(context),
], ],
); );
} }

@ -21,7 +21,6 @@ class EquipmentInternalAuditItemView extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
//TODO need to refactor this code repetation @waseem
if (requestData != null) { if (requestData != null) {
return Column( return Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
@ -60,7 +59,7 @@ class EquipmentInternalAuditItemView extends StatelessWidget {
), ),
], ],
).toShadowContainer(context, withShadow: showShadow).onPress(() async { ).toShadowContainer(context, withShadow: showShadow).onPress(() async {
Navigator.push(context, MaterialPageRoute(builder: (context) => EquipmentInternalAuditDetailPage(auditId: requestDetails!.id!))); Navigator.push(context, MaterialPageRoute(builder: (context) => EquipmentInternalAuditDetailPage(auditId: requestData!.id!)));
}); });
} }
return Column( return Column(

@ -61,7 +61,7 @@ class SystemInternalAuditItemView extends StatelessWidget {
), ),
], ],
).toShadowContainer(context, withShadow: showShadow).onPress(() async { ).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( return Column(

@ -101,7 +101,9 @@ class _AllRequestsFilterPageState extends State<AllRequestsFilterPage> {
types = {"TRAF": 9}; types = {"TRAF": 9};
} }
if (context.userProvider.isQualityUser) { 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 = { final statuses = {

@ -44,11 +44,9 @@ class _MyRequestsPageState extends State<MyRequestsPage> {
Request(2, context.translation.gasRefill), Request(2, context.translation.gasRefill),
Request(3, context.translation.transferAsset), Request(3, context.translation.transferAsset),
Request(4, context.translation.preventiveMaintenance), Request(4, context.translation.preventiveMaintenance),
]; ];
if (Provider.of<UserProvider>(context, listen: false).user!.type != UsersTypes.normal_user) { if (Provider.of<UserProvider>(context, listen: false).user!.type != UsersTypes.normal_user) {
requestsList.add(Request(5, context.translation.recurrentWo)); requestsList.add(Request(5, context.translation.recurrentWo));
} }
//TODO unCommit this to enable task //TODO unCommit this to enable task
requestsList.add(Request(6, context.translation.taskRequest)); requestsList.add(Request(6, context.translation.taskRequest));
@ -80,6 +78,7 @@ class _MyRequestsPageState extends State<MyRequestsPage> {
if (context.userProvider.isQualityUser) { if (context.userProvider.isQualityUser) {
requestsList = [ requestsList = [
Request(null, context.translation.allWorkOrder), Request(null, context.translation.allWorkOrder),
if (context.settingProvider.isUserFlowMedical) Request(7, 'Recall and Alert'),
Request(10, 'Equipment Internal Audit'), Request(10, 'Equipment Internal Audit'),
Request(11, 'System Internal Audit'), Request(11, 'System Internal Audit'),
]; ];

Loading…
Cancel
Save