standardize take of a course in FE

- semester is now stored as a string(same enum as in BE), and not ints.
  This makes some utility functions redundant and simplifies processing.

- The 'semester' and 'year' fields of Course, have been moved to
   the 'take' object field of a Course. Now, the Course 'data_year'
  and 'semester' fields purely reflect the course's state in the DB.

  This distinction is important for courses with any "any" field,
  whose assigned take in pratice(sem1/sem2) may be different
  from the one stated in the DB, as well as annual semesters which
  are currently classified as year 1.

Author: nmdanny

Closure_Front_End/src/components/Semester.vue

@@ -50,7 +50,7 @@ export default {
       return this.courses
         .filter(
           (course) =>
-            course.year == this.year.id && course.semester == this.semester.id
+            course.take.year === this.year.id && course.take.semester === this.semester.id
         )
         .sort((c1, c2) => c1.type - c2.type);
     },

Closure_Front_End/src/components/Year.vue

@@ -26,8 +26,8 @@ export default {
   data() {
     return {
       semesters: [
-        { id: 1, name: "סמסטר א" },
-        { id: 2, name: "סמסטר ב" },
+        { id: "FIRST", name: "סמסטר א" },
+        { id: "SECOND", name: "סמסטר ב" },
       ]
     };
   },

Closure_Front_End/src/course-store.js

@@ -28,8 +28,8 @@ export const moveCourse = ({course, newYear, newSemester}) => {
     if (!course) {
         throw new Error("Course must not be undefined/null")
     }
-    course.year = newYear
-    course.semester = newSemester
+    course.take.year = newYear
+    course.take.semester = newSemester
 }
 
 export const deleteCourse = (course) => {

Closure_Front_End/src/huji-import/CandidateCourses.vue

@@ -46,11 +46,11 @@
         <td>
             <div class="control">
             <label class="radio">
-                <input type="radio" id="one" value="FIRST" v-model="course.semester">
+                <input type="radio" id="one" value="FIRST" v-model="course.take.semester">
                 א'
             </label>
             <label class="radio">
-                <input type="radio" id="two" value="SECOND" v-model="course.semester">
+                <input type="radio" id="two" value="SECOND" v-model="course.take.semester">
                 ב'
             </label>
             </div>
@@ -110,7 +110,7 @@ export default {
 
     /** The semester must be set for all courses in order to begin the import */
     canImport() {
-      return this.courses.every(course => course.semester)
+      return this.courses.every(course => course.take.semester)
     },
 
     /** If the user has already inserted courses before beginning import, 

Closure_Front_End/src/huji-import/ParsedCoursesTables.vue

@@ -30,19 +30,22 @@ const processCourses = async (parsedCourses, http) => {
             console.error(res.data.results)
         }
         const gottenCourse = res.data.results[0]
-        const finalCourse = { ... course, name: gottenCourse.name, type: gottenCourse.type }
+        const finalCourse = { ...gottenCourse,
+                              take: { year: course.year, semester: course.semester }, 
+                              statistics_url: course.statistics_url
+                            };
         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 `
                           +`${gottenCourse.semester}, but student took it in ${course.semester}`)
-              finalCourse.semester = course.semester
+              finalCourse.take.semester  = course.semester
             } else {
-              finalCourse.semester = gottenCourse.semester
+              finalCourse.take.semester = gottenCourse.semester
             }
         } else if (gottenCourse.semester === "EITHER") {
           finalCourse.ambiguous = !course.semester
         } else if (["ANNUAL", "SUMMER"].includes(gottenCourse.semester)) {
-          finalCourse.semester = 'FIRST'
+          finalCourse.take.semester = 'FIRST'
           console.warn(`Course ${course.course_id} - ${course.name} at year ${course.year} which is offered at unsupported period `
                         +`${gottenCourse.semester}, will be considered as part of the first semester`)
         }
@@ -65,8 +68,9 @@ export default {
     const finishedProcessing = ref(false)
     
     onMounted(async () => {
-      console.log(`processing ${parsedCourses.value.length} courses`);
+      console.log(`processing ${parsedCourses.value.length} courses scraped from HUJI site:`, parsedCourses.value);
       const processedCourses = await processCourses(parsedCourses, http)
+      console.log(`processed courses`, processedCourses)
 
       processedCourses.sort((a, b) => {
         if (a.ambiguous === b.ambiguous) {

Closure_Front_End/src/utils.js

@@ -1,18 +1,3 @@
-
-/** A mapping between API "semester" values to the "semester" property used in the front-end,
-    which indicates their positioning.
- */
-export const API_SEMESTER_TO_PROP_INT = new Map(Object.entries({
-  FIRST: 1,
-  SECOND: 2
-}))
-
-/** A mapping between the "semester" property values used in the front-end, to their corresponding
- *  values in the backend API
- */
-export const PROP_INT_TO_API_SEMESTER = new Map(Array.from(API_SEMESTER_TO_PROP_INT, a => a.reverse()))
-
- 
 export function isString(x) {
   return Object.prototype.toString.call(x) === "[object String]"
 }

Closure_Front_End/src/views/CourseImport.vue

@@ -51,7 +51,6 @@ import Instructions from "@/huji-import/Instructions.vue";
 import { default as INITIAL_COURSES } from "@/huji-import/example-parsed-courses.js";
 import { TRY_HOOK_MESSAGE_TYPE, HOOKED_MESSAGE_TYPE, STARTED_MESSAGE_TYPE, GOT_COURSE_MESSAGE_TYPE, FINISHED_PARSING_MESSAGE_TYPE } from '@/huji-import/course-scrape-communication.js'
 import ParsedCoursesTables from "@/huji-import/ParsedCoursesTables.vue";
-import { API_SEMESTER_TO_PROP_INT } from "@/utils.js";
 
 const HUJI_ORIGIN = "https://www.huji.ac.il";
 
@@ -119,12 +118,15 @@ export default {
       this.courses.push({ ...course, key: this.courses.length });
     },
     onImportCourses({ courses, importMode }) {
-      const firstYear = Math.min(...courses.map(course => course.year));
+      console.log('onImportCourses', courses)
+      const firstYear = Math.min(...courses.map(course => course.take.year));
       const coursesForDisplay = courses.map(course => {
         return {
           ...course,
-          year: course.year - firstYear + 1,
-          semester: API_SEMESTER_TO_PROP_INT.get(course.semester)
+          take: {
+            year: course.take.year - firstYear + 1,
+            semester: course.take.semester
+          }
         };
       });
       addCourses(coursesForDisplay, importMode === 'overwrite');