From ba96eb4aaa76e83532e203f4c4a57fcfa2bd95db Mon Sep 17 00:00:00 2001
From: sharmayash105 <sharmayash105@gmail.com>
Date: Wed, 13 Apr 2022 23:35:11 +0530
Subject: [PATCH 1/2] making events recur

---
 src/pages/TimeTable.js | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/src/pages/TimeTable.js b/src/pages/TimeTable.js
index 6fd5f1a..6bd626f 100644
--- a/src/pages/TimeTable.js
+++ b/src/pages/TimeTable.js
@@ -14,6 +14,8 @@ import DialogTitle from '@material-ui/core/DialogTitle';
 import SnackBar from '@material-ui/core/Snackbar';
 import MuiAlert from '@material-ui/lab/Alert';
 import Box from '@material-ui/core/Box';
+import Checkbox from '@material-ui/core/Checkbox';
+import FormControlLabel from '@material-ui/core/FormControlLabel';
 
 import './TimeTable.css';
 
@@ -104,8 +106,22 @@ function TimeTable({ eventList, handleNewCustomEvent }) {
     // TODO: Ensure that end date is after start date, might mess up the Calendar library otherwise
     const startDate = new Date(`${eventDate} ${startTime}:00`);
     const endDate = new Date(`${eventDate} ${endTime}:00`);
+    const weekly = document.getElementById('weekly_recur');
+    const daily = document.getElementById('daily_recur');
+
     if (startDate < endDate) {
       handleNewCustomEvent(title, startDate, endDate);
+
+      if (weekly.checked) {
+        for (let i = 0; i < 4; i += 1) {
+          handleNewCustomEvent(title, startDate.getDate() + 7, endDate);
+        }
+      }
+      if (daily.checked) {
+        for (let i = 1; i < 7; i += 1) {
+          handleNewCustomEvent(title, startDate.getDate() + i, endDate);
+        }
+      }
     } else {
       handleNewCustomEvent(title, endDate, startDate);
     }
@@ -215,6 +231,26 @@ function TimeTable({ eventList, handleNewCustomEvent }) {
             }}
           />
         </DialogContent>
+        {/* eslint-disable-next-line jsx-a11y/label-has-associated-control */}
+        {/* <label htmlFor="daily_recur">Daily:
+        <input type="checkbox" id='daily_recur'/></label> */}
+        <FormControlLabel
+          control={
+            <Checkbox name="checkedB" color="primary" id="daily_recur" />
+          }
+          label="-Daily"
+        />
+
+        {/* eslint-disable-next-line jsx-a11y/label-has-associated-control */}
+        {/* <label htmlFor="weekly_recur">Weekly:
+        <input type="checkbox" id='weekly_recur'/></label> */}
+        <FormControlLabel
+          control={
+            <Checkbox name="checkedB" color="primary" id="weekly_recur" />
+          }
+          label="-Weekly"
+        />
+
         <DialogActions>
           <Button
             onClick={genNewEvent}

From 960c7df25c56e0c11235f748c5af9fced9e09560 Mon Sep 17 00:00:00 2001
From: sharmayash105 <sharmayash105@gmail.com>
Date: Wed, 20 Apr 2022 20:11:51 +0530
Subject: [PATCH 2/2] recurring end date corrected

---
 src/App.js             | 65 +++++++++++++++++++++-------------------
 src/makeEventList.js   |  2 +-
 src/pages/Bus.js       |  4 +--
 src/pages/TimeTable.js | 67 ++++++++++++++++++++++++++++++++++--------
 4 files changed, 91 insertions(+), 47 deletions(-)

diff --git a/src/App.js b/src/App.js
index 6c4690a..f5f01e8 100644
--- a/src/App.js
+++ b/src/App.js
@@ -64,25 +64,14 @@ function App() {
 
   const db = firebase.firestore();
 
-  const addCustomEvent = (eventName, startTime, endTime) => {
-    const newEvent = {
-      title: eventName,
-      start: new Date(startTime),
-      end: new Date(endTime),
-    };
-    localStorage.setItem(
-      customKey,
-      JSON.stringify([...customEvents, newEvent]),
-    );
-
-    const newEventList = makeEventList(aimsTimetable, [
-      ...customEvents,
-      newEvent,
-    ]);
+  const addCustomEvent = (events) => {
+    const newCustomEvents = customEvents.slice();
+    newCustomEvents.push(...events);
+    const newEventList = makeEventList(aimsTimetable, newCustomEvents);
     localStorage.setItem(masterKey, JSON.stringify(newEventList));
-
+    localStorage.setItem(customKey, JSON.stringify(newCustomEvents));
     setEventList(newEventList);
-    setCustomEvents((currentList) => [...currentList, newEvent]);
+    setCustomEvents(newCustomEvents);
   };
 
   const updateTT = () => {
@@ -93,20 +82,24 @@ function App() {
         .then((doc) => {
           if (doc.exists) {
             const tt = {};
+
             tt.identifiedCourses = doc.data().identifiedCourses;
             tt.identifiedSegments = doc.data().identifiedSegments;
             tt.identifiedSlots = doc.data().identifiedSlots;
 
+            if ('identifiedCourseNames' in doc.data()) {
+              tt.identifiedCourseNames = doc.data().identifiedCourseNames;
+            } else {
+              tt.identifiedCourseNames = null;
+            }
+
             if (JSON.stringify(aimsTimetable) !== JSON.stringify(tt)) {
               const newEventList = makeEventList(tt, customEvents);
-              console.log(newEventList);
               localStorage.setItem(masterKey, JSON.stringify(newEventList));
               setEventList(newEventList);
               localStorage.setItem(aimsKey, JSON.stringify(tt));
               setAimsTimetable(tt);
             }
-          } else {
-            console.log('No such document');
           }
         })
         .catch((err) => {
@@ -155,21 +148,31 @@ function App() {
 
   if (userLoading) {
     return (
-      <div
-        style={{
-          position: 'absolute',
-          left: '50%',
-          top: '50%',
-          transform: 'translate(-50%,-50%)',
-        }}
-      >
-        <CircularProgress />
-      </div>
+      <ThemeProvider theme={theme}>
+        <CssBaseline />
+        <Container>
+          <div
+            style={{
+              position: 'absolute',
+              left: '50%',
+              top: '50%',
+              transform: 'translate(-50%,-50%)',
+            }}
+          >
+            <CircularProgress />
+          </div>
+        </Container>
+      </ThemeProvider>
     );
   }
 
   if (!user) {
-    return <Login />;
+    return (
+      <ThemeProvider theme={theme}>
+        <CssBaseline />
+        <Login />
+      </ThemeProvider>
+    );
   }
   if (window.location.pathname === '/iith-dashboard-pwa') window.location.href = '/';
   return (
diff --git a/src/makeEventList.js b/src/makeEventList.js
index a903826..a169545 100644
--- a/src/makeEventList.js
+++ b/src/makeEventList.js
@@ -9,7 +9,7 @@ const segmentStartDates = [
   '2021-11-18 00:00:00',
 ];
 
-const segmentEndDates = [
+export const segmentEndDates = [
   '2021-09-01 11:59:59',
   '2021-09-17 11:59:59',
   '2021-10-07 11:59:59',
diff --git a/src/pages/Bus.js b/src/pages/Bus.js
index e9a9675..ab57c73 100644
--- a/src/pages/Bus.js
+++ b/src/pages/Bus.js
@@ -12,8 +12,8 @@ import './Bus.css';
 
 function Bus({ schedule, loading, error }) {
   const [location, setLocation] = useState('LAB');
-  //const [isWeekend, setIsWeekend] = useState(false);
-  const isWeekend  = false;
+  // const [isWeekend, setIsWeekend] = useState(false);
+  const isWeekend = false;
   const [open, setOpen] = useState(false);
   // const toggleWeek = () => {
   //   setIsWeekend(!isWeekend);
diff --git a/src/pages/TimeTable.js b/src/pages/TimeTable.js
index 6bd626f..72a6677 100644
--- a/src/pages/TimeTable.js
+++ b/src/pages/TimeTable.js
@@ -16,6 +16,7 @@ import MuiAlert from '@material-ui/lab/Alert';
 import Box from '@material-ui/core/Box';
 import Checkbox from '@material-ui/core/Checkbox';
 import FormControlLabel from '@material-ui/core/FormControlLabel';
+import { segmentEndDates } from '../makeEventList';
 
 import './TimeTable.css';
 
@@ -96,7 +97,6 @@ function TimeTable({ eventList, handleNewCustomEvent }) {
   const handleEndChange = (event) => {
     endTime = event.target.value;
   };
-
   const genNewEvent = () => {
     if (!eventDate || !endTime || !startTime) {
       alert('Start and End Times must be specified to create a new event');
@@ -108,26 +108,65 @@ function TimeTable({ eventList, handleNewCustomEvent }) {
     const endDate = new Date(`${eventDate} ${endTime}:00`);
     const weekly = document.getElementById('weekly_recur');
     const daily = document.getElementById('daily_recur');
-
+    const limitDate = new Date(`${segmentEndDates[5]}`);
     if (startDate < endDate) {
-      handleNewCustomEvent(title, startDate, endDate);
-
+      const newCustomEvents = [];
       if (weekly.checked) {
-        for (let i = 0; i < 4; i += 1) {
-          handleNewCustomEvent(title, startDate.getDate() + 7, endDate);
+        for (let i = 0; i < limitDate.getDate(); i += 1) {
+          newCustomEvents.push({
+            start: new Date(startDate),
+            end: new Date(endDate),
+            title,
+          });
+          startDate.setDate(startDate.getDate() + 7);
+          endDate.setDate(endDate.getDate() + 7);
         }
-      }
-      if (daily.checked) {
-        for (let i = 1; i < 7; i += 1) {
-          handleNewCustomEvent(title, startDate.getDate() + i, endDate);
+      } else if (daily.checked) {
+        for (let i = 0; i < limitDate.getDate(); i += 1) {
+          newCustomEvents.push({
+            start: new Date(startDate),
+            end: new Date(endDate),
+            title,
+          });
+          startDate.setDate(startDate.getDate() + 1);
+          endDate.setDate(endDate.getDate() + 1);
         }
+      } else {
+        newCustomEvents.push({
+          start: new Date(startDate),
+          end: new Date(endDate),
+          title,
+        });
       }
+      handleNewCustomEvent(newCustomEvents);
+      handleClose();
     } else {
-      handleNewCustomEvent(title, endDate, startDate);
+      const newCustomEvents = [];
+      if (weekly.checked) {
+        for (let i = 0; i < limitDate.getDate(); i += 1) {
+          newCustomEvents.push({
+            start: new Date(endDate),
+            end: new Date(startDate),
+            title,
+          });
+          startDate.setDate(startDate.getDate() + 7);
+          endDate.setDate(endDate.getDate() + 7);
+        }
+      } else if (daily.checked) {
+        for (let i = 0; i < limitDate.getDate(); i += 1) {
+          newCustomEvents.push({
+            start: new Date(endDate),
+            end: new Date(startDate),
+            title,
+          });
+          startDate.setDate(startDate.getDate() + 1);
+          endDate.setDate(endDate.getDate() + 1);
+        }
+      } else {
+        newCustomEvents.push({ start: endDate, end: startDate, title });
+      }
     }
-    handleClose();
   };
-
   return (
     <div id="calendar-div">
       <FullCalendar
@@ -266,12 +305,14 @@ function TimeTable({ eventList, handleNewCustomEvent }) {
 }
 
 TimeTable.propTypes = {
+  // eslint-disable-next-line
   eventList: PropTypes.arrayOf(PropTypes.object),
   handleNewCustomEvent: PropTypes.func,
 };
 
 TimeTable.defaultProps = {
   eventList: [],
+  // eslint-disable-next-line
   handleNewCustomEvent: () => {
     alert('Error, please try again later');
   },