Various fixes

Author: mjaydenkim

client/src/modules/Admin/Components/DevTools.tsx

@@ -42,6 +42,18 @@ export default function AdminTools({ token }: AdminToolsProps) {
     }
   };
 
+  const handleCourseEvalApiCall = async (endpoint: string, successState: keyof typeof messages, resetEvals: boolean) => {
+    setUpdating(true)
+    try {
+      await axios.post(endpoint, { token, resetEvals });
+      setUpdated(successState);
+    } catch {
+      setUpdated('failure');
+    } finally {
+      setUpdating(false);
+    }
+  };
+
   const raffleHandler = async () => {
     if (!raffleStartDate) return;
     setUpdating(true);
@@ -79,12 +91,23 @@ export default function AdminTools({ token }: AdminToolsProps) {
           Add New Semester
         </button>
         <button
-          onClick={() => handleApiCall('/api/admin/courses/add-course-evals', 'courseEval')}
+          onClick={() =>
+            handleCourseEvalApiCall('/api/admin/courses/add-course-evals', 'courseEval', false)
+          }
           disabled={updating}
           className={styles.adminButtons}
         >
           Add Course Evaluations
         </button>
+        <button
+          onClick={() =>
+            handleCourseEvalApiCall('/api/admin/courses/add-course-evals', 'courseEval', true)
+          }
+          disabled={updating}
+          className={styles.adminButtons}
+        >
+          Delete and regenerate all Course Evaluations
+        </button>
         <button
           onClick={() =>
             handleApiCall('/api/admin/professors/add', 'professors')

client/src/modules/Course/Components/Course.tsx

@@ -342,7 +342,7 @@ export const Course = () => {
               <div className={styles.tabIndicator}></div>
 
               {/* Add a blue active indicator that moves */}
-              <div className={`${styles.activeIndicator} ${reviewTabSelected ? styles.firstTab : styles.secondTab}`}></div>
+              <div className={`${courseEval != null ? styles.activeIndicator : styles.noEvalsIndicator} ${reviewTabSelected ? styles.firstTab : styles.secondTab}`}></div>
             </div>
             {reviewTabSelected && (
               <div className={styles.reviewscontainer}>

client/src/modules/Course/Components/CourseEval.tsx

@@ -211,7 +211,7 @@ const CourseEval = ({courseEval}: CourseEvalProps) => {
     labels: ['Freshman', 'Sophomore', 'Junior', 'Senior'],
     datasets: [
       {
-        label: '# of Students',
+        label: ' # of Students',
         data: [
           courseEval.numFresh,
           courseEval.numSoph,
@@ -234,7 +234,7 @@ const CourseEval = ({courseEval}: CourseEvalProps) => {
     labels: ['CALS', 'AAP', 'CAS', 'COE', 'Hotel', 'HumEc', 'ILR'],
     datasets: [
       {
-        label: '# of Students',
+        label: ' # of Students',
         data: [
           courseEval.numAg,
           courseEval.numArch,
@@ -285,13 +285,14 @@ const CourseEval = ({courseEval}: CourseEvalProps) => {
         </div>
         <div className={`${styles.container} ${styles.studentYear}`}>
           <h1>Student Year</h1>
-          <div style={{width:'90%', height:'90%'}}>
+          <div style={{width:'99%', height:'99%'}}
+          >
             <Pie options={pieOptions} data={yearData}/>
           </div>
         </div>
         <div className={`${styles.container} ${styles.schoolCollege}`}>
           <h1>School / College</h1>
-          <div style={{width:'90%', height:'90%'}}>
+          <div style={{width:'99%', height:'99%'}}>
             <Pie options={pieOptions} data={collegeData}/>
           </div>
         </div>

client/src/modules/Course/Styles/Course.module.css

@@ -78,8 +78,17 @@
   bottom: 24px;
   height: 2px;
   background-color: var(--clr-blue-300);
+  transition: transform 0.3s ease;
   width: 50%;
+}
+
+.noEvalsIndicator {
+  position: absolute;
+  bottom: 24px;
+  height: 2px;
+  background-color: var(--clr-blue-300);
   transition: transform 0.3s ease;
+  width: 100%;
 }
 
 /* Position for first tab selected */

client/src/modules/Course/Styles/CourseEval.module.css

@@ -84,15 +84,16 @@
     grid-area: reasonTaking;
     display: flex;
     flex-direction: column;
-    justify-content: center;
+    justify-content: space-between;
     gap:16px;
 
     .textContainer {
+        margin: 0 auto;
+        height: 90%;
         display: flex;
         flex-direction: column;
         align-items: flex-start;
         gap: 24px;
-        align-self: stretch;
     }
 
     p {

package.json

@@ -26,6 +26,5 @@
     "typescript": "^5.4.5",
     "vite-plugin-eslint": "^1.8.1"
   },
-  "version": "0.0.0",
-  "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
+  "version": "0.0.0"
 }

server/scripts/populate-course-evals.ts

@@ -199,15 +199,17 @@ const mergeCourseEvaluations = (
  *
  * @returns true if operation was successful, false otherwise
  * @param data course eval json data
+ * @param resetEvals true if user wants to delete all existing
+ * course evals and regenerate them, false if user only
+ * wants to add new course evals
  */
 export const addCourseEvalsFromJson = async (
-  data: CourseEvaluationsRaw
+  data: CourseEvaluationsRaw,
+  resetEvals: boolean
 ): Promise<boolean> => {
   const parsedData: CourseEvaluations = parseEval(data)
 
-  // Uncomment if you want to reset and repopulate the database,
-  // instead of skipping over currently existing indices
-  // await CourseEvaluations.deleteMany({})
+  if (resetEvals) await CourseEvaluations.deleteMany({})
 
   const v1 = await Promise.all(
     Object.entries(parsedData)
@@ -244,8 +246,8 @@ export const addCourseEvalsFromJson = async (
 /** Adds course evaluations to database.
  *  !!! UNCOMMENT WHEN YOU NEED TO ADD COURSE EVALS !!!
  *  Also uncomment in admin.controller.ts */
-export const addCurrCourseEvals = async () => {
-  // await addCourseEvalsFromJson(courseData)
+export const addCurrCourseEvals = async (resetEvals: boolean) => {
+  // await addCourseEvalsFromJson(courseData, resetEvals)
   return true
 };
 

server/src/admin/admin.controller.ts

@@ -412,14 +412,14 @@ export const addNewSemDb = async ({ auth, semester }: AdminAddSemesterType) => {
  *
  * @returns true if operation was successful, false if operations was not successful, null if token not admin
  */
-export const addNewCourseEvals = async ({ auth }: VerifyAdminType) => {
+export const addNewCourseEvals = async ({ auth }: VerifyAdminType, resetEvals: boolean) => {
   const userIsAdmin = verifyTokenAdmin({ auth });
   if (!userIsAdmin) {
     return null;
   }
 
   // UNCOMMENT WHEN USING FUNCTION!!!!!!
-  // return await addCurrCourseEvals();
+  // return await addCurrCourseEvals(resetEvals);
 
   return false;
 };

server/src/admin/admin.router.ts

@@ -5,7 +5,7 @@ import {
   AdminReviewRequestType,
   AdminRequestType,
   AdminUserRequestType,
-  AdminAddSemesterRequestType
+  AdminAddSemesterRequestType, CourseEvalRequestType
 } from './admin.type';
 import {
   getPendingReviews,
@@ -381,10 +381,10 @@ adminRouter.post('/semester/add', async (req, res) => {
  * Adds all course evals to the db based on hard-coded JSON files. For admins only
  */
 adminRouter.post('/courses/add-course-evals', async (req, res) => {
-  const { token }: AdminRequestType = req.body;
+  const { token, resetEvals }: CourseEvalRequestType = req.body;
   try {
     const auth = new Auth({ token });
-    const result = await addNewCourseEvals({ auth });
+    const result = await addNewCourseEvals({ auth }, resetEvals);
 
     if (result === null) {
       return res.status(401).json({

server/src/admin/admin.type.ts

@@ -25,6 +25,11 @@ export interface AdminRequestType {
   token: string;
 }
 
+export interface CourseEvalRequestType {
+  token: string;
+  resetEvals: boolean;
+}
+
 export interface VerifyAdminType {
   auth: Auth;
 }