From 104967bff0755225f8dcac77c0df3c93b6fddf64 Mon Sep 17 00:00:00 2001
From: Selena Liu <sl2663@cornell.edu>
Date: Sat, 9 Mar 2024 15:53:36 -0500
Subject: [PATCH 1/2] Edit visual indicator for active vs inactive students

---
 frontend/src/components/UserTables/StudentsTable.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/UserTables/StudentsTable.tsx b/frontend/src/components/UserTables/StudentsTable.tsx
index 879a90135..aeb180b47 100644
--- a/frontend/src/components/UserTables/StudentsTable.tsx
+++ b/frontend/src/components/UserTables/StudentsTable.tsx
@@ -129,7 +129,7 @@ const StudentsTable = ({ searchName }: studentTableProps) => {
             endDate
           )}`;
           const usageData = getUsageData(id);
-          const isStudentInvalid = moment().isAfter(moment(endDate)) && active;
+          const isStudentInvalid = moment().isAfter(moment(endDate)) && !active;
           const location = {
             pathname: `/riders/${r.id}`,
           };

From 412ffc07ebf24f544c8acd4313181a885b1e2dd4 Mon Sep 17 00:00:00 2001
From: Selena Liu <sl2663@cornell.edu>
Date: Sat, 23 Mar 2024 16:20:09 -0400
Subject: [PATCH 2/2] Add filter to displayed riders on admin side so they are
 only showed active riders

---
 frontend/src/components/RideModal/Pages/RiderInfo.tsx | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/RideModal/Pages/RiderInfo.tsx b/frontend/src/components/RideModal/Pages/RiderInfo.tsx
index e6039330c..1595ae54f 100644
--- a/frontend/src/components/RideModal/Pages/RiderInfo.tsx
+++ b/frontend/src/components/RideModal/Pages/RiderInfo.tsx
@@ -21,6 +21,7 @@ const RiderInfoPage = ({ formData, onBack, onSubmit }: ModalPageProps) => {
   const [locationToId, setLocationToId] = useState<ObjectType>({});
   const { locations } = useLocations();
   const { riders } = useRiders();
+  const filteredRiders = riders.filter((r) => r.active == true);
 
   const beforeSubmit = ({ name, pickupLoc, dropoffLoc }: ObjectType) => {
     const rider = nameToId[name.toLowerCase()];
@@ -30,7 +31,7 @@ const RiderInfoPage = ({ formData, onBack, onSubmit }: ModalPageProps) => {
   };
 
   useEffect(() => {
-    const nameToIdObj = riders.reduce((acc: ObjectType, r: Rider) => {
+    const nameToIdObj = filteredRiders.reduce((acc: ObjectType, r: Rider) => {
       const fullName = `${r.firstName} ${r.lastName}`.toLowerCase();
       acc[fullName] = r.id;
       return acc;
@@ -64,7 +65,13 @@ const RiderInfoPage = ({ formData, onBack, onSubmit }: ModalPageProps) => {
           />
           {errors.name && <p className={styles.error}>Rider not found</p>}
           <datalist id="names">
-            {riders.map((r) => (
+            {/* people.filter((person) => person.name !== 'John') */}
+            {/* {riders.filter((r) => (
+              <option key={r.id}>
+                {r.firstName} {r.lastName}
+              </option>
+            ))} */}
+            {filteredRiders.map((r) => (
               <option key={r.id}>
                 {r.firstName} {r.lastName}
               </option>