simplified import and export

Author: RuiSoares333

src/components/planner/sidebar/sessionController/CsvExport.tsx

@@ -4,6 +4,7 @@ import CourseContext from '../../../../contexts/CourseContext'
 import MultipleOptionsContext from '../../../../contexts/MultipleOptionsContext'
 import { AnalyticsTracker, Feature } from '../../../../utils/AnalyticsTracker'
 import { csvEncode } from '../../../../utils/io'
+import api from '../../../../api/backend'
 
 
 /**
@@ -13,43 +14,33 @@ const CsvExport = () => {
   const { pickedCourses } = useContext(CourseContext);
   const { multipleOptions } = useContext(MultipleOptionsContext);
 
-  enum GetOptionsBy {NAME, ID}
+  const getOptions = async (): Promise<string[]> => {
+    const lines = [];
+
+    for(const course of pickedCourses) {
+      const baseInfo = [course.course_id, course.course_unit_year, csvEncode(course.name), course.acronym]
 
-  const getOptions = (getByName: GetOptionsBy): string[] => 
-    pickedCourses.map(course => {
-      const baseInfo = getByName === GetOptionsBy.NAME ? 
-            [course.course_unit_year, csvEncode(course.name), course.acronym] :
-            [course.id];
-  
       const classValues = multipleOptions.map(option => {
         const courseOption = option.course_options.find(co => co.course_id === course.id);
         const pickedClass = courseOption ? 
               course.classes.find(c => c.id === courseOption.picked_class_id) : 
               undefined;
-  
-        return csvEncode(getByName === GetOptionsBy.NAME ? pickedClass?.name : pickedClass?.id?.toString() || '');
+
+        return csvEncode(pickedClass?.name);
       });
-  
-      return [...baseInfo, ...classValues].join(',');
+      lines.push([...baseInfo, ...classValues].join(','));
     }
-  );
-  
 
-  const exportCSV = () => {
-    const header = ['Ano', 'Nome', 'Sigla']
-    multipleOptions.forEach((option) => header.push(option.name))
-    header.push(pickedCourses.length.toString())
-
-    const lines = getOptions(GetOptionsBy.NAME);
-
-    lines.push("////----////----////----////----////----////----////")
-
-    const header_ids = ['UC_ID']
-    multipleOptions.forEach((option) => header_ids.push(option.name + "_ID"))
+    return lines;
+  }
+  
+  const exportCSV = async () => {
+    const header = ['ID_Curso', 'Ano', 'Nome', 'Sigla']
+    multipleOptions.forEach((option) => header.push(option.name));
 
-    const lines_id = getOptions(GetOptionsBy.ID);
+    const lines = await getOptions();
 
-    const csv = [header.join(','), lines.flat().join('\n'), header_ids.join(','), lines_id.flat().join('\n')].join('\n')
+    const csv = [header.join(','), lines.flat().join('\n')].join('\n')
     const blob = new Blob([csv], { type: 'text/csv' })
     const url = URL.createObjectURL(blob)
     const a = document.createElement('a')

src/components/planner/sidebar/sessionController/CsvImport.tsx

@@ -7,7 +7,7 @@ const CsvImport = ({handleClick}) => {
     <div>
       <button
         onClick={handleClick}
-        className="group flex w-full items-center gap-2 dark:text-white rounded-md p-1 text-gray text-sm disabled:cursor-not-allowed disabled:opacity-50"
+        className="group flex w-full items-center gap-2n dark:text-white rounded-md p-1 text-gray text-sm  disabled:cursor-not-allowed disabled:opacity-50"
       >
         <ArrowDownOnSquareIcon className="h-5 w-5 text-secondary hover:brightness-200" />
         <span className="pl-1">Importar Opções (CSV)</span>

src/components/planner/sidebar/sessionController/Export.tsx

@@ -18,7 +18,7 @@ import { toast } from '../../../ui/use-toast'
 const Export = () => {
 
   const fileInputRef = useRef(null);
-  const { setPickedCourses, setCheckboxedCourses } = useContext(CourseContext);
+  const { pickedCourses, setPickedCourses, setCheckboxedCourses } = useContext(CourseContext);
   const { multipleOptions, setMultipleOptions } = useContext(MultipleOptionsContext);
 
   const handleFileChange = async (event: React.ChangeEvent<HTMLInputElement>) => {
@@ -29,11 +29,13 @@ const Export = () => {
 
     try {
       const content = csvDecode(await file.text());
+      console.log("input content",content);
       const courses = await getSelectedCourses(content);
+      console.log("selected courses",courses);
 
       setCheckboxedCourses(courses);
       setPickedCourses(courses);
-      setCourseOptions(content);
+      setCourseOptions(content, courses);
     } catch (error) {
       toast({
         title: 'Não foi possível importar os horários!',
@@ -43,35 +45,41 @@ const Export = () => {
     }
   };
 
-  const getSelectedCourses = async (content: any): Promise<CourseInfo[]> => {
+  const getSelectedCourses = async (content: string[][]): Promise<CourseInfo[]> => {
     if (!Array.isArray(content) || content.length === 0) return [];
-  
-    const selected_courses = await Promise.all(content.map(row => api.getCourseUnit(row[0])));
-
-    const majorsPromises = selected_courses.map(course => api.getCoursesByMajorId(course.course));
-    const majorsResults = await Promise.all(majorsPromises);
 
-    selected_courses.forEach((course, index) => {
-      const full_courses = majorsResults[index];
-      const matching_course = full_courses.find(indiv_course => indiv_course.course_unit_id === course.id);
-      if (matching_course) {
-        course.ects = matching_course.ects;
-      }
+    const courses: CourseInfo[] = [];
+  
+    const promises = content.map(async (row) => {
+      const res = await api.getCoursesByMajorId(parseInt(row[0]));
+      const matchedCourses = res.filter(course => course.acronym === row[3]);
+      courses.push(...matchedCourses);
     });
+  
+    await Promise.all(promises);
 
-    return selected_courses;
+    for(const course of courses){
+      if(typeof(course.ects) === "string")
+        course.ects = parseFloat(course.ects.replace(",", "."));
+    }
+
+    return courses;
   };
 
-  const setCourseOptions = (courses: number[][]) => {
-    const transposedCourses = courses[0].map((_, colIndex) => courses.map(row => row[colIndex]));
-  
-    const newOptions = transposedCourses.slice(1, 11).map((column, i) => 
-      createOption(multipleOptions[i], column.map((value, j) => 
-        createCourseOption(transposedCourses[0][j], value)
-      ))
-    );
-  
-    setMultipleOptions(newOptions);
+  const setCourseOptions = async (content: string[][], courses: CourseInfo[]) => {
+    const updatedOptions = [...multipleOptions];
+
+    for (let i = 0; i < courses.length; i++) {
+      const courseOptions = await api.getCourseClass(courses[i]);
+      content[i].slice(4).forEach((courseOption, j) => {
+        const matchedClassOption = courseOptions.find(classOption => classOption.name === courseOption);
+        if (matchedClassOption) {
+          updatedOptions[j].course_options.push(createCourseOption(courses[i].id, matchedClassOption.id));
+        }
+      });
+    }
+
+    setMultipleOptions(updatedOptions);
   };
 
   const createCourseOption = (course_id: number, picked_class_id: number): CourseOption => {
@@ -84,15 +92,6 @@ const Export = () => {
     }
   }
 
-  const createOption = (option : Option, new_course_options : Array<CourseOption>) => {
-    return {
-      id: option.id,
-      icon: option.icon,
-      name: option.name,
-      course_options: new_course_options
-    }
-  }
-
   const handleClick = () => {
     fileInputRef.current.click();
   };

src/utils/io.ts

@@ -7,19 +7,8 @@ const csvEncode = (text: string | null | undefined) => {
   }
 
   const csvDecode = (text: string | null | undefined) => {
-    const lines = text.split('\n');
-  
-    const first_line = lines[0].split(',');
-    const nr_of_courses = first_line[first_line.length - 1];
-  
-    const id_start = parseInt(nr_of_courses) + 3
-  
-    const id_lines = lines.slice(id_start, lines.length);
-  
-    return id_lines.map(line =>{
-      return line.split(',').map(option_number => {
-        return parseInt(option_number);
-      });
+    return text.split('\n').slice(1).map(line =>{
+      return line.split(',')
     });
   };