S25 staff schedule error fix: #2656

.env.development

@@ -4,8 +4,8 @@
 # VITE_API_URL=https://360Api.gordon.edu/
 
 # @TRAIN
- VITE_API_URL=https://360ApiTrain.gordon.edu/
+# VITE_API_URL=https://360ApiTrain.gordon.edu/
 
 # @LOCALHOST
-# VITE_API_URL=http://localhost:51660/
+ VITE_API_URL=http://localhost:51634/
 

package.json

@@ -19,7 +19,7 @@
     "lodash": "^4.17.21",
     "prop-types": ">=15.7.2",
     "react": "^18.3.1",
-    "react-big-calendar": "^1.10.3",
+    "react-big-calendar": "^1.19.2",
     "react-chartjs-2": "^5.2.0",
     "react-cropper": "^2.3.3",
     "react-csv": "^2.0.3",

src/components/Profile/components/SchedulePanel/ScheduleHeader.module.scss

@@ -30,3 +30,8 @@
     border-top-right-radius: 4px;
   }
 }
+
+.quad-course {
+  max-width: 50%;
+  background-color: red;
+}

src/components/Profile/components/SchedulePanel/components/ScheduleCalendar/ScheduleCalendar.scss

@@ -293,3 +293,18 @@ button.rbc-input::-moz-focus-inner {
   border-bottom: 1px solid var(--mui-palette-neutral-dark);
   flex-shrink: 0;
 }
+
+.subterm {
+  max-width: 55% !important;
+  padding-left: 2px;
+  filter: brightness(145%);
+  left: auto !important;
+}
+
+.subterm1 {
+  left: 0%;
+}
+
+.subterm2 {
+  right: 0%;
+}

src/components/Profile/components/SchedulePanel/components/ScheduleCalendar/index.tsx

@@ -3,6 +3,7 @@
 import './ScheduleCalendar.css';
 import { format, getDay, startOfWeek } from 'date-fns';
 import { enUS } from 'date-fns/locale';
+import EventWrapper from 'react-big-calendar/lib/addons/dragAndDrop';
 
 const locales = {
   'en-US': enUS,
@@ -20,6 +21,10 @@
   onSelectEvent: (event: CourseEvent) => void;
 };
 
+const EventWrapperCustom = ({ label }: { label: CourseEvent }) => {
+  return <strong>test {label.title}</strong>;
+};
+
 const GordonScheduleCalendar = ({ schedule, onSelectEvent }: Props) => {
   const dayStart = new Date();
   dayStart.setHours(8, 0, 0, 0);
@@ -35,12 +40,31 @@
       : course.location.includes('null')
         ? (title = tempTitle)
         : (title = tempTitle + `\n${course.location}`);
+
     return { ...course, title };
   });
 
+  console.log(courseFormat);
+
   return (
     <Calendar
+      //components={{event: EventWrapperCustom}}
       style={{ whiteSpace: 'pre-wrap' }}
+      eventPropGetter={(event: CourseEvent) => {
+        const firstQuadOfSemester = ['Fall 1', 'Spring 1', 'Summer 1'];
+        const secondQuadOfSemester = ['Fall 2', 'Spring 2', 'Summer 2'];
+        let subtermClassNames = ['subterm'];
+        console.log(event.subtermCode);
+        console.log(secondQuadOfSemester.includes(event.subtermCode));
+        if (firstQuadOfSemester.includes(event.subtermCode)) {
+          subtermClassNames.push('subterm1');
+        } else if (secondQuadOfSemester.includes(event.subtermCode)) {
+          subtermClassNames.push('subterm2');
+        } else {
+          return {};
+        }
+        return { className: subtermClassNames.join(' ') };
+      }}
       events={courseFormat}
       localizer={localizer}
       min={dayStart}

src/components/Profile/components/SchedulePanel/index.tsx

@@ -17,6 +17,7 @@ import styles from './ScheduleHeader.module.css';
 import scheduleService, { CourseEvent, Schedule } from 'services/schedule';
 import sessionService from 'services/session';
 import { Profile } from 'services/user';
+import { AuthError } from 'services/error';
 
 type Props = {
   profile: Profile;
@@ -38,17 +39,22 @@ const GordonSchedulePanel = ({ profile, myProf }: Props) => {
     Promise.all([
       scheduleService.getAllSessionSchedules(profile.AD_Username),
       sessionService.getCurrent(),
-    ]).then(([allSessionSchedules, currentSession]) => {
-      setAllSchedules(allSessionSchedules);
-      const defaultSchedule =
-        // If there is a schedule for the current session, make it d4fault
-        allSessionSchedules.find((s) => s.session.SessionCode === currentSession.SessionCode) ??
-        // Otherwise, use the most recent session
-        allSessionSchedules[0];
-      setSelectedSchedule(defaultSchedule);
-      setLoading(false);
-    });
+    ])
+      .then(([allSessionSchedules, currentSession]) => {
+        setAllSchedules(allSessionSchedules);
+        const defaultSchedule =
+          // If there is a schedule for the current session, make it d4fault
+          allSessionSchedules.find((s) => s.session.SessionCode === currentSession.SessionCode) ??
+          // Otherwise, use the most recent session
+          allSessionSchedules[0];
+        setSelectedSchedule(defaultSchedule);
+        setLoading(false);
+      })
+      .catch((reason: AuthError) => {
+        setLoading(false);
+      });
   }, [profile.AD_Username]);
+
   const toggleIsScheduleOpen = () => {
     setIsScheduleOpen((wasOpen) => {
       localStorage.setItem(scheduleOpenKey, String(!wasOpen));

src/components/Profile/index.tsx

@@ -38,8 +38,9 @@
 
   const isOnline = useNetworkStatus();
   const viewerIsPolice = useAuthGroups(AuthGroup.Police);
   const [canReadStudentSchedules, setCanReadStudentSchedules] = useState<boolean>();
   const profileIsStudent = profile.PersonType?.includes('stu');
+  const profileIsStaff = profile.Type == 'Staff'; // should we create an dict enum of the possible values?
 
   const createSnackbar = useCallback(
     (message: string, severity: AlertColor, link?: string, linkText?: string) => {
@@ -84,11 +85,12 @@
         </Grid>
       )}
 
-      {(myProf || !profileIsStudent || canReadStudentSchedules) && (
+      {
+        // is it only faculty that have schedule? could we say if faculty instead here?
         <Grid item xs={12} lg={10}>
           <SchedulePanel profile={profile} myProf={myProf} />
         </Grid>
-      )}
+      }
 
       <Grid item xs={12} lg={5}>
         <Grid container spacing={2}>

src/services/schedule.ts

@@ -19,6 +19,7 @@
   BEGIN_TIME?: string;
   /** A timespan of the format HH:mm:ss, stringified */
   END_TIME?: string;
+  SUB_TERM_CDE?: string;
   Role: string;
 };
 
@@ -62,6 +63,7 @@
   name: string;
   title: string;
   location: string;
+  subtermCode: string;
   start: Date;
   end: Date;
   allDay?: boolean;
@@ -84,11 +86,12 @@
   // Because saturday is only included in the schedule if a non-async course meetst that day
   const asyncMeetingDays = courseDayIds.slice(0, -1);
 
   return courses.map((course) => {
     const sharedDetails = {
       name: course.CRS_TITLE.trim(),
       title: course.CRS_CDE.trim(),
       location: course.BLDG_CDE + '\u00A0' + course.ROOM_CDE,
+      subtermCode: course.SUB_TERM_CDE,
     };
 
     if (course.ROOM_CDE === 'ASY') {