add course type to huji import + add more coursetype colors

Author: nmdanny

Closure_Front_End/src/components/CourseBox.vue

@@ -28,8 +28,10 @@ export default {
 
   methods: {
     colorMatch() {
-      if (this.course.type == 1) return "must";
-      if (this.course.type == 2) return "choose_from_list";
+      if (this.course.type === "MUST") return "must";
+      if (this.course.type === "CHOOSE_FROM_LIST") return "choose_from_list";
+      if (this.course.type === "CORNER_STONE") return "corner_stone";
+      if (this.course.type === "SUPPLEMENTARY") return "supplementary";
       return "choice";
     },
   },
@@ -63,6 +65,14 @@ export default {
   color: #fbaf5d;
 }
 
+.corner_stone {
+  color: #69d85e;
+}
+
+.supplementary {
+  color: #bfbfbf;
+}
+
 .choice {
   color: #f06eaa;
 }

Closure_Front_End/src/huji-import/CandidateCourses.vue

@@ -17,12 +17,20 @@
     <strong>{{ambiguousCourses.length}}</strong>
     מהקורסים, יש לבחור ידנית את הסמסטר
   </div>
+  <div class="notification is-warning" v-if="!isTrackDefined">
+    לא הוגדר מסלול עבור המשתמש, אז סוגי הקורסים אינם מוגדרים.
+  </div>
+  <div class="notification" v-if="isTrackDefined">
+    סוגי הקורסים הם ביחס למסלול המוגדר אצל המשתמש, 
+    <strong>{{trackName}}</strong>
+  </div>
   <table class="table">
     <thead>
       <tr>
         <th>מספר קורס</th>
         <th>שם קורס</th>
         <th>נקודות זכות</th>
+        <th>סוג</th>
         <th>סמסטר</th>
       </tr>
     </thead>
@@ -32,6 +40,7 @@
         <td>{{ course.course_id }}</td>
         <td>{{ course.name }}</td>
         <td>{{ course.points }}</td>
+        <td>{{ displayCourseType(course) }}</td>
         <td>
             <div class="control">
             <label class="radio">
@@ -83,6 +92,15 @@
 
 <script>
 import { courses as currentCourses } from '@/course-store.js'
+
+const MODEL_COURSE_TYPE_TO_STRING = new Map([
+  ["MUST", "חובה"],
+  ["CHOICE", "בחירה"],
+  ["CHOOSE_FROM_LIST", "בחירה מרשימה"],
+  ["CORNER_STONE", "אבן פינה"],
+  ["SUPPLEMENTARY", "משלים"]
+])
+
 export default {
   props: {
     courses: Array,
@@ -105,8 +123,25 @@ export default {
      */
     currentlySavedCoursesCount() {
       return currentCourses.length
+    },
+
+    isTrackDefined() {
+      return !!this.studentAndClaims.student.track
+    },
+
+    trackName() {
+      return this.studentAndClaims.student.track?.name ?? "לא מוגדר"
+    }
+  },
+  methods: {
+    displayCourseType(course) {
+      if (!MODEL_COURSE_TYPE_TO_STRING.has(course.type)) {
+        return "לא ידוע";
+      }
+      return MODEL_COURSE_TYPE_TO_STRING.get(course.type);
     }
   },
+  inject: ['studentAndClaims'],
   data() { return {
     importMode: 'combine'
   }

Closure_Front_End/src/huji-import/ParsedCoursesTables.vue

@@ -30,7 +30,7 @@ const processCourses = async (parsedCourses, http) => {
             console.error(res.data.results)
         }
         const gottenCourse = res.data.results[0]
-        const finalCourse = { ... course, name: gottenCourse.name }
+        const finalCourse = { ... course, name: gottenCourse.name, type: gottenCourse.type }
         if (["FIRST", "SECOND"].includes(gottenCourse.semester)) {
             if (course.semester && course.semester !== gottenCourse.semester) {
               console.warn(`Course ${course.course_id} - ${course.name} at year ${course.year} is offered only in semester `