semester filter with all semester opition

GTBitsOfGood · Nov 13, 2023 · a5d7091 · a5d7091
1 parent d551e4e
commit a5d7091
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/src/pages/api/get_users.js b/src/pages/api/get_users.js
@@ -15,8 +15,8 @@ async function handler(req, res) {
     {
       $match: {
         $and: [
-          { "tenures.semester": { $in: [req.query.semester] } },
-          { "tenures.year": { $in: [Number(req.query.year)] } },
+          req.query.semester == "All" ? {} : { "tenures.semester": { $in: [req.query.semester] } },
+          req.query.semester == "All" ? {} : { "tenures.year": { $in: [Number(req.query.year)] } },
           {
             $or: [
               { email: { $regex: new RegExp(query, "i") } },

diff --git a/src/screens/AdminDashboard/AdminDashboard.tsx b/src/screens/AdminDashboard/AdminDashboard.tsx
@@ -90,7 +90,7 @@ const StyledSelect = styled(Select)(() => ({
 }));
 
 function AdminDashboardPage({ url }) {
-  const [semester, setSemester] = useState("Fall 2023");
+  const [semester, setSemester] = useState("All");
   const [department, setDepartment] = useState("All");
   const [showUploadModal, setShowUploadModal] = useState(false);
   const [fileBlob, setFileBlob] = useState(null);

diff --git a/src/screens/AdminDashboard/UserTable/UserTable.tsx b/src/screens/AdminDashboard/UserTable/UserTable.tsx
@@ -6,6 +6,9 @@ import { User } from "../types";
 import sendRequest from "../../../server/utils/sendToBackend";
 
 function UserTable({ currentSemester, newMembers, roleFilter, departmentFilter, filter }) {
+  if (currentSemester == "All") {
+    currentSemester = "All All";
+  }
   const [userList, setUserList] = useState<User[]>([]);
 
   useEffect(() => {

diff --git a/src/server/utils/fields.js b/src/server/utils/fields.js
@@ -6,7 +6,17 @@ const memberTypes = {
   2: "Root Admin",
 };
 
-const semesterOptions = ["Spring 2020", "Fall 2020", "Spring 2021", "Fall 2021", "Spring 2022", "Fall 2022", "Spring 2023", "Fall 2023"];
+const semesterOptions = [
+  "All",
+  "Spring 2020",
+  "Fall 2020",
+  "Spring 2021",
+  "Fall 2021",
+  "Spring 2022",
+  "Fall 2022",
+  "Spring 2023",
+  "Fall 2023",
+];
 
 const departments = [
   "All",