diff --git a/lib/dashboard_latest/widgets/progress_fragment.dart b/lib/dashboard_latest/widgets/progress_fragment.dart index 8f60be60..b7329fd3 100644 --- a/lib/dashboard_latest/widgets/progress_fragment.dart +++ b/lib/dashboard_latest/widgets/progress_fragment.dart @@ -170,7 +170,7 @@ class ProgressFragment extends StatelessWidget { @override Widget build(BuildContext context) { _userProvider = Provider.of(context); - bool isCurrentUserIsNurse = (_userProvider.user!.type == UsersTypes.normal_user); + bool isCurrentUserIsNurse = (_userProvider.user?.type == UsersTypes.normal_user); return Consumer( builder: (context, snapshot, _) { int total = 0; diff --git a/lib/modules/cm_module/views/components/activities_list_view.dart b/lib/modules/cm_module/views/components/activities_list_view.dart index 3b6021ca..fa580b32 100644 --- a/lib/modules/cm_module/views/components/activities_list_view.dart +++ b/lib/modules/cm_module/views/components/activities_list_view.dart @@ -225,14 +225,13 @@ class _ActivitiesListViewState extends State { ], ], ).toShadowContainer(context, padding: 12, showShadow: false).onPress(() { - if (userProvider.user!.userID != requestDetailProvider.currentWorkOrder?.data?.assignedEmployee?.userId) { - requestDetailProvider.isReadOnlyRequest = true; - } else { - requestDetailProvider.isReadOnlyRequest = false; - } if (requestDetailProvider.isReadOnlyRequest) { editSparePartRequest(context: context, requestDetailProvider: requestDetailProvider, activity: activity); } + else if(userProvider.user!.userID == requestDetailProvider.currentWorkOrder?.data?.assignedEmployee?.userId) { + requestDetailProvider.isReadOnlyRequest = true; + editSparePartRequest(context: context, requestDetailProvider: requestDetailProvider, activity: activity); + } }); } @@ -339,15 +338,13 @@ class _ActivitiesListViewState extends State { // ] ], ).toShadowContainer(context, padding: 12, showShadow: false).onPress(() { - if (userProvider.user!.userID != requestDetailProvider.currentWorkOrder?.data?.assignedEmployee?.userId) { - requestDetailProvider.isReadOnlyRequest = true; - } else { - requestDetailProvider.isReadOnlyRequest = false; - } - if (requestDetailProvider.isReadOnlyRequest) { editMaintenanceRequest(context: context, requestDetailProvider: requestDetailProvider, activity: activity); } + else if(userProvider.user!.userID == requestDetailProvider.currentWorkOrder?.data?.assignedEmployee?.userId) { + requestDetailProvider.isReadOnlyRequest = true; + editMaintenanceRequest(context: context, requestDetailProvider: requestDetailProvider, activity: activity); + } }); } diff --git a/lib/modules/cm_module/views/components/service_request_detail_view.dart b/lib/modules/cm_module/views/components/service_request_detail_view.dart index 06d26e48..d161e6df 100644 --- a/lib/modules/cm_module/views/components/service_request_detail_view.dart +++ b/lib/modules/cm_module/views/components/service_request_detail_view.dart @@ -68,7 +68,9 @@ class _ServiceRequestDetailViewState extends State { initialVisitCard(requestDetailProvider: requestProvider, userProvider: _userProvider), assetDetailCard(requestDetailProvider: requestProvider, userProvider: _userProvider), 12.height, - if (context.userProvider.user!.type == UsersTypes.engineer) ...[ + if (context.userProvider.user!.type == UsersTypes.engineer && + !requestProvider.isReadOnlyRequest && + requestProvider.currentWorkOrder!.data!.nextStep?.workOrderNextStepEnum == WorkOrderNextStepEnum.activity) ...[ costCard(context, requestProvider), 12.height, ], @@ -310,14 +312,13 @@ class _ServiceRequestDetailViewState extends State { style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral120), ), ], - - if (!requestProvider.isReadOnlyRequest) ...[ +//workOrderNextStepStatus == WorkOrderNextStepEnum.assignToMe + if (!requestProvider.isReadOnlyRequest && userProvider.user?.type == UsersTypes.engineer && workOrder.nextStep?.workOrderNextStepEnum == WorkOrderNextStepEnum.activity) ...[ 8.height, const Divider().defaultStyle(context), MultiFilesPicker( label: context.translation.attachments, files: _workOrderAttachments, - // attachment: _workOrderAttachments, buttonColor: AppColor.primary10, onlyImages: false, buttonIcon: 'quotation_icon'.toSvgAsset(color: AppColor.primary10), @@ -483,13 +484,16 @@ class _ServiceRequestDetailViewState extends State { Text( 'Travel Cost: ${provider.currentWorkOrder!.data?.travelCost ?? '-'}', style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral120), - ), Text( + ), + Text( 'Quot Amount: ${provider.currentWorkOrder!.data?.qAmount ?? '-'}', style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral120), - ), Text( + ), + Text( 'PR No: ${provider.currentWorkOrder!.data?.prNo ?? '-'}', style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral120), - ), Text( + ), + Text( 'PO No: ${provider.currentWorkOrder!.data?.poNo ?? '-'}', style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral120), ),