From edd22bf4afb711204b4bd4e21ab7f880a65a05fd Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Thu, 20 Feb 2025 13:18:36 +0300 Subject: [PATCH] stop working hide for nurse. --- lib/controllers/api_routes/urls.dart | 3 ++- .../notification/firebase_notification_manger.dart | 1 - lib/controllers/providers/api/ppm_provider.dart | 1 - .../views/components/history_log_view.dart | 6 ++++++ .../forms/maintenance_request/maintenance_request_main.dart | 4 ++-- lib/views/pages/user/ppm/update_ppm/update_ppm.dart | 1 - .../request_approval_waiting_bottom_sheet.dart | 1 - 7 files changed, 10 insertions(+), 7 deletions(-) diff --git a/lib/controllers/api_routes/urls.dart b/lib/controllers/api_routes/urls.dart index a1e9f611..a99806b2 100644 --- a/lib/controllers/api_routes/urls.dart +++ b/lib/controllers/api_routes/urls.dart @@ -3,7 +3,8 @@ class URLs { static const String appReleaseBuildNumber = "14"; // static const host1 = "https://atomsm.hmg.com"; // production url - static const host1 = "https://atomsmdev.hmg.com"; // local UAT url + static const host1 = "https://atomsmdev.hmg.com"; // local DEV url + // static const host1 = "https://atomsmuat.hmg.com"; // local UAT url // static String _baseUrl = "$_host/mobile"; static final String _baseUrl = "$_host/v2/mobile"; // new V2 apis diff --git a/lib/controllers/notification/firebase_notification_manger.dart b/lib/controllers/notification/firebase_notification_manger.dart index 5e70794c..3c78fad6 100644 --- a/lib/controllers/notification/firebase_notification_manger.dart +++ b/lib/controllers/notification/firebase_notification_manger.dart @@ -79,7 +79,6 @@ class FirebaseNotificationManger { } static void handleMessage(context, Map messageData) { - print('message data i got is ${messageData}'); if (messageData["requestType"] != null && messageData["requestNumber"] != null) { Widget? serviceClass; diff --git a/lib/controllers/providers/api/ppm_provider.dart b/lib/controllers/providers/api/ppm_provider.dart index 8da87c92..8e4696df 100644 --- a/lib/controllers/providers/api/ppm_provider.dart +++ b/lib/controllers/providers/api/ppm_provider.dart @@ -154,7 +154,6 @@ class PpmProvider extends ChangeNotifier { Response response = await ApiManager.instance.get(URLs.getPlanPreventiveVisitById + "?planPreventiveVisitId=$id"); if (response.statusCode >= 200 && response.statusCode < 300) { planPreventiveVisit = PlanPreventiveVisit.fromJson(json.decode(response.body)["data"]); - print('data i got is ${planPreventiveVisit?.toJson(status: 0)}'); isLoading = false; notifyListeners(); return planPreventiveVisit; diff --git a/lib/service_request_latest/views/components/history_log_view.dart b/lib/service_request_latest/views/components/history_log_view.dart index 092b7640..554f3e58 100644 --- a/lib/service_request_latest/views/components/history_log_view.dart +++ b/lib/service_request_latest/views/components/history_log_view.dart @@ -1,11 +1,13 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; import 'package:test_sa/controllers/api_routes/urls.dart'; +import 'package:test_sa/controllers/providers/api/user_provider.dart'; import 'package:test_sa/extensions/context_extension.dart'; import 'package:test_sa/extensions/int_extensions.dart'; import 'package:test_sa/extensions/string_extensions.dart'; import 'package:test_sa/extensions/text_extensions.dart'; import 'package:test_sa/extensions/widget_extensions.dart'; +import 'package:test_sa/models/enums/user_types.dart'; import 'package:test_sa/models/new_models/work_order_detail_model.dart'; import 'package:test_sa/new_views/app_style/app_color.dart'; import 'package:test_sa/service_request_latest/service_request_detail_provider.dart'; @@ -41,6 +43,10 @@ class HistoryLogView extends StatelessWidget { String lastStatus = ""; DateTime? nextDate; var workOrderHistory = requestProvider.currentWorkOrder!.data!.workOrderHistory; + bool isNurse = (Provider.of(context, listen: false).user?.type) == UsersTypes.normal_user; + if(isNurse) { + workOrderHistory.removeWhere((element)=>element.step?.id==5617); + } for (int i = 0; i < workOrderHistory.length; i++) { var object = workOrderHistory[i]; String currentStatus = object.workorderStatus!.name!; diff --git a/lib/service_request_latest/views/forms/maintenance_request/maintenance_request_main.dart b/lib/service_request_latest/views/forms/maintenance_request/maintenance_request_main.dart index 90f4ebcd..e60383bb 100644 --- a/lib/service_request_latest/views/forms/maintenance_request/maintenance_request_main.dart +++ b/lib/service_request_latest/views/forms/maintenance_request/maintenance_request_main.dart @@ -49,7 +49,7 @@ class _MaintenanceRequestFormState extends State with Si bool isUpdate = requestDetailProvider.activityMaintenanceHelperModel?.id != 0; return Scaffold( backgroundColor: AppColor.neutral110, - appBar: DefaultAppBar(title: isUpdate ? "Update Activity" : "New Activity"), + appBar: const DefaultAppBar(title: "CM Activity"), body: Stack( children: [ DefaultTabController( @@ -98,7 +98,7 @@ class _MaintenanceRequestFormState extends State with Si buttonColor: AppColor.primary10, onPressed: () async { //TODO add this as dropdown not added in design yet Bhaa need to confirm with hussain then. - requestDetailProvider.activityMaintenanceHelperModel?.lastSituationId = 282; + // requestDetailProvider.activityMaintenanceHelperModel?.lastSituationId = 282; if (validate(model: requestDetailProvider.activityMaintenanceHelperModel!)) { requestDetailProvider.activityMaintenanceHelperModel?.activityMaintenanceTimers = requestDetailProvider.activityMaintenanceHelperModel?.activityMaintenanceTimers ?? []; diff --git a/lib/views/pages/user/ppm/update_ppm/update_ppm.dart b/lib/views/pages/user/ppm/update_ppm/update_ppm.dart index 207b544c..1b98f25a 100644 --- a/lib/views/pages/user/ppm/update_ppm/update_ppm.dart +++ b/lib/views/pages/user/ppm/update_ppm/update_ppm.dart @@ -53,7 +53,6 @@ class _UpdatePpmState extends State with TickerProviderStateMixin { ppmProvider.planPreventiveVisit?.preventiveVisitAttachments ?.add(PreventiveVisitAttachments(id: 0, attachmentName: ServiceRequestUtils.isLocalUrl(item.path) ? "${item.path.split("/").last}|${base64Encode(item.readAsBytesSync())}" : item.path)); } - log('data i got is ${ppmProvider.planPreventiveVisit?.toJson(status: status)}'); ppmProvider.planPreventiveVisit?.preventiveVisitTimers = ppmProvider.planPreventiveVisit?.preventiveVisitTimers ?? []; ppmProvider.planPreventiveVisit?.timerModelList?.forEach((timer) { diff --git a/lib/views/widgets/bottom_sheets/request_approval_waiting_bottom_sheet.dart b/lib/views/widgets/bottom_sheets/request_approval_waiting_bottom_sheet.dart index 85d1d1c2..93db544a 100644 --- a/lib/views/widgets/bottom_sheets/request_approval_waiting_bottom_sheet.dart +++ b/lib/views/widgets/bottom_sheets/request_approval_waiting_bottom_sheet.dart @@ -46,7 +46,6 @@ class _RequestApprovalBottomState extends State { // }); } else { FirebaseMessaging.onMessage.listen((RemoteMessage message) { - print('message data i got is ${message.toMap()}'); ConfirmArrivalNotificationModel notificationModel = ConfirmArrivalNotificationModel.fromJson(message.data); if(notificationModel.requestId!=null&¬ificationModel.accept!=null){ if(notificationModel.accept=='True'){