fix: Nouveau formatage des notes sur l'intranet

Author: PaulBayfield

src/average.js

@@ -24,15 +24,27 @@ class Average {
         const subjects = document.querySelectorAll("#mainContent > div.row > div:nth-child(4) > div > div > table > tbody tr");
         const grades = document.querySelectorAll("#mainContent > div.row > div:nth-child(3) > div > div > table > tbody tr");
 
-        // Récupérer les matières et les coefficients
         for (const subject of subjects) {
-            if (subject.children[0].textContent.split('|').length === 1) {
-                console.warn("[Better IUT RCC] Aucune matière n'a été saisie");
-                continue;
-            }
+            let subjectCode = '';
+            let subjectName = '';
+
+            if (subject.children[0].textContent.includes('|')) {
+                if (subject.children[0].textContent.split('|').length === 1) {
+                    console.warn("[Better IUT RCC] Aucune matière n'a été saisie");
+                    continue;
+                }
 
-            let subjectCode = subject.children[0].textContent.split('|')[0].trim();
-            let subjectName = subject.children[0].textContent.split('|')[1].trim();
+                subjectCode = subject.children[0].textContent.split('|')[0].trim();
+                subjectName = subject.children[0].textContent.split('|')[1].trim();
+            } else {
+                if (subject.children[0].textContent.split('-').length === 1) {
+                    console.warn("[Better IUT RCC] Aucune matière n'a été saisie");
+                    continue;
+                }
+
+                subjectCode = subject.children[0].textContent.split('-')[0].trim();
+                subjectName = subject.children[0].textContent.split('-')[1].trim();
+            };
 
             let subjectFull = subjectCode + ' • ' + subjectName;
 
@@ -58,6 +70,8 @@ class Average {
                 coefficients: subjectCoefficients
             };
         };
+    
+        console.warn(this.subjectData);
 
         // Récupérer les notes et les coefficients
         for (const grade of grades) {
@@ -70,6 +84,12 @@ class Average {
             let gradeValue = Number.parseFloat(grade.children[4].children[0].textContent.replace(',', '.'));
             let coefficient = Number.parseFloat(grade.children[5].textContent.replace(',', '.'));
 
+            if (subject.includes('|')) {
+                subject = subject.split('|')[0].trim();
+            } else if (subject.includes('-')) {
+                subject = subject.split('-')[0].trim();
+            };
+
             if (!this.gradesData.hasOwnProperty(subject)) {
                 this.gradesData[subject] = []
             };
@@ -101,6 +121,12 @@ class Average {
             let subjectGrades = [];
             let subjectCoefficients = [];
 
+            if (subject.includes('|')) {
+                subject = subject.split('|')[0].trim();
+            } else if (subject.includes('-')) {
+                subject = subject.split('-')[0].trim();
+            };
+
             if (this.gradesData.hasOwnProperty(subject)) {
                 for (const gradeData of this.gradesData[subject]) {
                     subjectGrades.push(gradeData.grade);
@@ -136,6 +162,12 @@ class Average {
         this.averageGradeData = Object.fromEntries(Object.entries(this.averageGradeData).sort());
         this.averageSubjectData = Object.fromEntries(Object.entries(this.averageSubjectData).sort());
         this.proficiencies = this.proficiencies.sort();
+
+        console.warn(this.gradesData);
+        console.warn(this.subjectData);
+        console.warn(this.averageGradeData);
+        console.warn(this.averageSubjectData);
+        console.warn(this.proficiencies);
     }
 
 

src/functions.js

@@ -459,18 +459,24 @@ export function fetchAllSortedGrades(htmlTable) {
             let buttonUrl = row.querySelector('td:nth-child(7) > button').getAttribute('data-modal-modal-url-value').split('/');
             let gradeId = parseInt(buttonUrl[buttonUrl.length - 1]);
             let gradeSubject = row.querySelector("td:nth-child(1)").textContent;
-            let gradeSubjectDescription = row.querySelector("td:nth-child(1)").querySelector('abbr')?.getAttribute('title');
             let gradeEvaluation = row.querySelector("td:nth-child(2)").textContent;
             let gradeDate = row.querySelector("td:nth-child(3)").textContent;
             let gradeComment = row.querySelector("td:nth-child(4)").textContent;
             let gradeValue = Number(row.querySelector('td:nth-child(5) .badge').textContent.replace(',', '.'));
             gradeValue = isNaN(gradeValue) ? -1 : gradeValue;
             let gradeCoefficient = Number(row.querySelector('td:nth-child(6)').textContent);
 
+            let subject = gradeSubject;
+            if (gradeSubject.includes('|')) {
+                subject = gradeSubject.split('|')[0].trim();
+            } else if (gradeSubject.includes('-')) {
+                subject = gradeSubject.split('-')[0].trim();
+            };
+
             let grade = {
                 id: gradeId,
-                subject: gradeSubject,
-                subjectDescription: gradeSubjectDescription,
+                subject: subject,
+                subjectDescription: gradeSubject,
                 evaluation: gradeEvaluation,
                 date: gradeDate,
                 comment: gradeComment,
@@ -682,7 +688,7 @@ export function recreateTable(average, sortedGrades, knownGrades) {
         if (i === sortedGrades.length - 1 || sortedGrades[i + 1].subject !== grade.subject) {
             let trAverage = createRow({
                 subject: `<i class="fa-solid fa-calculator"></i> ${grade.subject}`,
-                subjectDescription: average.subjectDescription,
+                subjectDescription: null,
                 evaluation: '━ Moyenne ━━━━',
                 grade: average.subjectAverage(grade.subject.trim()),
             }, true);
@@ -724,7 +730,7 @@ export function createRow(grade, isAverage, isNew = false) {
 
     let subject = grade.subject;
     if (grade.subjectDescription) {
-        subject = [grade.subject, grade.subjectDescription]
+        subject = grade.subjectDescription
     };
 
     const columns = [
@@ -758,18 +764,12 @@ export function createRow(grade, isAverage, isNew = false) {
         }
 
         let td = document.createElement('td');
-        if (Array.isArray(content)) {
-            let abbr = document.createElement('abbr');
-            abbr.textContent = content[0];
-            abbr.title = content[1];
-            td.appendChild(abbr);
-        } else
-            if (typeof content === 'string' || content instanceof String) {
-                td.innerHTML = content;
-            } else {
-                td.appendChild(content);
-            }
-            tr.appendChild(td);
+        if (typeof content === 'string' || content instanceof String) {
+            td.innerHTML = content;
+        } else {
+            td.appendChild(content);
+        }
+        tr.appendChild(td);
     });
 
     return tr;