patch

2026-03-11 11:43:27 -04:00
parent f39bcf4c16
commit 5489dbf327
20 changed files with 37 additions and 19 deletions
--- a/client/src/components/center-calendar/CenterCalendar.js
+++ b/client/src/components/center-calendar/CenterCalendar.js
@@ -316,7 +316,7 @@ const EventsCalendar = () => {


  useEffect(() => {
-    if (!AuthService.canAccessLegacySystem()) {
+    if (!AuthService.canViewCalendar()) {
      window.alert('You haven\'t login yet OR this user does not have access to this page. Please change an admin account to login.')
      AuthService.logout();
      navigate(`/login`);
--- a/client/src/components/event-request/CreateEventRequest.js
+++ b/client/src/components/event-request/CreateEventRequest.js
@@ -83,7 +83,7 @@ const CreateEventRequest = () => {
  

  useEffect(() => {
-    if (!AuthService.canAccessLegacySystem()) {
+    if (!AuthService.canViewMedicalSection()) {
      window.alert('You haven\'t login yet OR this user does not have access to this page. Please change an admin account to login.')
      AuthService.logout();
      navigate(`/login`);
--- a/client/src/components/event-request/EventRequestList.js
+++ b/client/src/components/event-request/EventRequestList.js
@@ -69,7 +69,7 @@ const EventRequestList = () => {
  ]);

  useEffect(() => {
-    if (!AuthService.canAccessLegacySystem()) {
+    if (!AuthService.canViewMedicalSection()) {
      window.alert('You haven\'t login yet OR this user does not have access to this page. Please change an admin account to login.')
      AuthService.logout();
      navigate(`/login`);
--- a/client/src/components/events/CreateEvent.js
+++ b/client/src/components/events/CreateEvent.js
@@ -134,7 +134,7 @@ const CreateEvent = () => {
  

  useEffect(() => {
-    if (!AuthService.canAccessLegacySystem()) {
+    if (!AuthService.canEditMedicalEvents()) {
      window.alert('You haven\'t login yet OR this user does not have access to this page. Please change an admin account to login.')
      AuthService.logout();
      navigate(`/login`);
--- a/client/src/components/events/EventsCalendar.js
+++ b/client/src/components/events/EventsCalendar.js
@@ -152,7 +152,7 @@ const EventsCalendar = () => {


  useEffect(() => {
-    if (!AuthService.canAccessLegacySystem()) {
+    if (!AuthService.canViewMedicalEvents()) {
      window.alert('You haven\'t login yet OR this user does not have access to this page. Please change an admin account to login.')
      AuthService.logout();
      navigate(`/login`);
--- a/client/src/components/events/EventsList.js
+++ b/client/src/components/events/EventsList.js
@@ -137,7 +137,7 @@ const EventsList = () => {
  };

  useEffect(() => {
-    if (!AuthService.canAccessLegacySystem()) {
+    if (!AuthService.canViewMedicalEvents()) {
      window.alert('You haven\'t login yet OR this user does not have access to this page. Please change an admin account to login.')
      AuthService.logout();
      navigate(`/login`);
--- a/client/src/components/events/EventsMultipleList.js
+++ b/client/src/components/events/EventsMultipleList.js
@@ -96,7 +96,7 @@ const EventsMultipleList = () => {
  };

  useEffect(() => {
-    if (!AuthService.canAccessLegacySystem()) {
+    if (!AuthService.canViewMedicalEvents()) {
      window.alert('You haven\'t login yet OR this user does not have access to this page. Please change an admin account to login.')
      AuthService.logout();
      navigate(`/login`);
--- a/client/src/components/events/UpdateEvent.js
+++ b/client/src/components/events/UpdateEvent.js
@@ -200,7 +200,7 @@ const UpdateEvent = () => {
  

  useEffect(() => {
-    if (!AuthService.canAccessLegacySystem()) {
+    if (!AuthService.canEditMedicalEvents()) {
      window.alert('You haven\'t login yet OR this user does not have access to this page. Please change an admin account to login.')
      AuthService.logout();
      navigate(`/login`);
--- a/client/src/components/events/ViewEvent.js
+++ b/client/src/components/events/ViewEvent.js
@@ -27,7 +27,7 @@ const ViewEvent = () => {
  }

  useEffect(() => {
-    if (!AuthService.canAccessLegacySystem()) {
+    if (!AuthService.canViewMedicalEvents()) {
      window.alert('You haven\'t login yet OR this user does not have access to this page. Please change an admin account to login.')
      AuthService.logout();
      navigate(`/login`);
--- a/client/src/components/home/menu.js
+++ b/client/src/components/home/menu.js
@@ -145,7 +145,7 @@ const SideMenu = () => {
 					name: 'Appointment One-Day List',
 					link: '/medical/events/list',
 					category: '/events/list',
-					roleFunc: AuthService.canAccessLegacySystem
+					roleFunc: AuthService.canViewMedicalEvents
 				},
 				// {
 				// 	name: 'Customer Report',
--- a/client/src/components/info-screen/InfoScreen.js
+++ b/client/src/components/info-screen/InfoScreen.js
@@ -115,7 +115,7 @@ const InfoScreen = () => {
  }

  useEffect(() => {
-    if (!AuthService.canViewRoutes()) {
+    if (!AuthService.canViewInfoScreen()) {
      window.alert('You haven\'t login yet OR this user does not have access to this page. Please change an admin account to login.');
      AuthService.logout();
      navigate('/login');
--- a/client/src/components/medical/Medical.js
+++ b/client/src/components/medical/Medical.js
@@ -69,7 +69,7 @@ const Medical = () => {
  }

  useEffect(() => {
-    if (!AuthService.canAccessLegacySystem()) {
+    if (!AuthService.canViewMedicalSection() && !AuthService.canViewMedicalEvents()) {
        
        window.alert('You haven\'t login yet OR this user does not have access to this page. Please change an admin account to login.')
        AuthService.logout();
--- a/client/src/components/medical/MedicalIndex.js
+++ b/client/src/components/medical/MedicalIndex.js
@@ -73,7 +73,7 @@ const MedicalIndex = () => {
  }

  useEffect(() => {
-    if (!AuthService.canAccessLegacySystem()) {
+    if (!AuthService.canViewMedicalSection() && !AuthService.canViewMedicalEvents()) {
        
        window.alert('You haven\'t login yet OR this user does not have access to this page. Please change an admin account to login.')
        AuthService.logout();
--- a/client/src/components/medical/TemplateManager.js
+++ b/client/src/components/medical/TemplateManager.js
@@ -22,7 +22,7 @@ const TemplateManager = () => {
  };

  useEffect(() => {
-    if (!AuthService.canAccessLegacySystem()) {
+    if (!AuthService.canViewMedicalSection()) {
      window.alert("You haven't login yet OR this user does not have access to this page. Please change an admin account to login.");
      AuthService.logout();
      navigate("/login");
--- a/client/src/components/resources/CreateResource.js
+++ b/client/src/components/resources/CreateResource.js
@@ -110,7 +110,7 @@ const CreateResource = () => {
  };

  useEffect(() => {
-    if (!AuthService.canAccessLegacySystem()) {
+    if (!AuthService.canViewMedicalSection()) {
      window.alert('You haven\'t login yet OR this user does not have access to this page. Please change an admin account to login.')
      AuthService.logout();
      navigate(`/login`);
--- a/client/src/components/resources/ResourcesList.js
+++ b/client/src/components/resources/ResourcesList.js
@@ -62,7 +62,7 @@ const ResourcesList = () => {
    }
  ]);
  useEffect(() => {
-    if (!AuthService.canAccessLegacySystem()) {
+    if (!AuthService.canViewMedicalSection()) {
      window.alert('You haven\'t login yet OR this user does not have access to this page. Please change an admin account to login.')
      AuthService.logout();
      navigate(`/login`);
--- a/client/src/components/resources/UpdateResource.js
+++ b/client/src/components/resources/UpdateResource.js
@@ -132,7 +132,7 @@ const UpdateResource = () => {
  }

  useEffect(() => {
-    if (!AuthService.canAccessLegacySystem()) {
+    if (!AuthService.canViewMedicalSection()) {
      window.alert('You haven\'t login yet OR this user does not have access to this page. Please change an admin account to login.')
      AuthService.logout();
      navigate(`/login`);
--- a/client/src/components/resources/ViewResource.js
+++ b/client/src/components/resources/ViewResource.js
@@ -49,7 +49,7 @@ const ViewResource = () => {
  }

  useEffect(() => {
-    if (!AuthService.canAccessLegacySystem()) {
+    if (!AuthService.canViewMedicalSection()) {
      window.alert('You haven\'t login yet OR this user does not have access to this page. Please change an admin account to login.')
      AuthService.logout();
      navigate(`/login`);
--- a/client/src/components/trans-routes/DailyTemplatesList.js
+++ b/client/src/components/trans-routes/DailyTemplatesList.js
@@ -55,7 +55,7 @@ const DailyTemplatesList = () => {
  ];

  useEffect(() => {
-    if (!AuthService.canAccessLegacySystem()) {
+    if (!AuthService.canViewRoutes()) {
      window.alert('You haven\'t login yet OR this user does not have access to this page. Please change an admin account to login.')
      AuthService.logout();
      navigate(`/login`);
--- a/client/src/services/AuthService.js
+++ b/client/src/services/AuthService.js
@@ -89,6 +89,22 @@ const canViewMedicalSection = () => {
  ]);
 }

+const canViewMedicalEvents = () => {
+  return hasAnyPermission([
+    'View _Calendar _Medical Appointment',
+    'Edit&Create _Calendar _Medical Appointment',
+    'View_Appointment Calendar',
+    'Edit & Create_Appointment Calendar'
+  ]);
+}
+
+const canEditMedicalEvents = () => {
+  return hasAnyPermission([
+    'Edit&Create _Calendar _Medical Appointment',
+    'Edit & Create_Appointment Calendar'
+  ]);
+}
+
 const canViewMealStatus = () => {
  return hasAnyPermission([
    'View_Meal Status',
@@ -291,6 +307,8 @@ export const AuthService = {
  canViewCalendar,
  canViewMessaging,
  canViewMedicalSection,
+  canViewMedicalEvents,
+  canEditMedicalEvents,
  canViewMealStatus,
  canViewSeatingChart,
  canViewLobby,