Support for electives on last year

js/guarani/PagesDataParser.js

@@ -227,7 +227,8 @@ UtnBaHelper.PagesDataParser = function (utils) {
 			let planCode = groups[1];
 
 			// Courses
-			return Promise.all($contents.find(".accordion").toArray().flatMap(accordion => {
+			let maxLevel = -1;
+			return Promise.all($contents.find(".accordion").toArray().flatMap((accordion, index, accordions) => {
 				let $accordion = $(accordion);
 				let $accordionHeading = $accordion.find("> .accordion-group > .accordion-heading a");
 				let areElectives = $accordionHeading.hasClass("materia_generica");
@@ -239,8 +240,14 @@ UtnBaHelper.PagesDataParser = function (utils) {
 				}
 				let levelText = $accordionHeading.text().trim().toLowerCase();
 				let level = levelsMapping[levelText];
+				// If level couldn't be matched, but this is an accordion of electives, is a first level accordion, and is the last one,
+				// Then it means they are the electives of the entire plan, and should be considered as part of the last level.
+				if (typeof level === "undefined" && areElectives && $parentAccordion.length === 0 && index === accordions.length - 1) {
+					level = maxLevel;
+				}
 				if (typeof level === "undefined") throw new Error(`Invalid levelText: '${levelText}. responseText: ${responseText}'`);
 				if (level === -1) return [];
+				maxLevel = Math.max(maxLevel, level);
 
 				return $accordion.find("table:first tbody tr:not(.correlatividades)").toArray().map(courseRow => {
 					let courseText = courseRow.querySelector("td").innerText.trim();

js/guarani/custompages/PlanTrackingCustomPage.js

@@ -74,11 +74,11 @@ UtnBaHelper.PlanTrackingCustomPage = function ($container, services) {
 	let loadPlan = function (planCode, coursesHistory) {
 		if (!planCode) return;
 		return services.apiConnector.getPlanCourses(planCode).then(planCourses => {
-			return loadPlanCourses(planCode, planCourses, coursesHistory);
+			return loadPlanCourses(planCourses, coursesHistory);
 		});
 	};
 
-	let loadPlanCourses = function (planCode, planCourses, coursesHistory) {
+	let loadPlanCourses = function (planCourses, coursesHistory) {
 		let courseNamesByCode = planCourses.reduce(function (courseNamesByCode, course) {
 			courseNamesByCode[course.courseCode] = course.courseName;
 			return courseNamesByCode;
@@ -88,13 +88,10 @@ UtnBaHelper.PlanTrackingCustomPage = function ($container, services) {
 		let passedCourses = coursesHistory.finalExams.filter(course => course.isPassed).map(course => course.courseCode);
 		let signedCourses = [...new Set([...passedCourses, ...coursesHistory.courses.filter(course => course.isPassed).map(course => course.courseCode)])];
 		let courseRequirementToArray = {
-			// We will always use the last 4 chars, removing the first 2 that identify the specific plan.
-			// This is done in order to connect passed courses that are transitive from a previous plan.
-			// For example, a student passed 952021 (K95), which is 082021 (K08) in the new plan.
-			"SIGNED": signedCourses.map(courseCode => courseCode.substring(2)),
-			"PASSED": passedCourses.map(courseCode => courseCode.substring(2)),
+			"SIGNED": signedCourses,
+			"PASSED": passedCourses,
 		};
-		let hasCourse = (requirement, courseCode) => courseRequirementToArray[requirement].indexOf(courseCode.substring(2)) !== -1;
+		let hasCourse = (requirement, courseCode) => courseRequirementToArray[requirement].includes(courseCode);
 
 		let getCoursesHtml = level => {
 			let lastWasElective = false;

manifest.json

@@ -2,7 +2,7 @@
   "manifest_version": 3,
   "name": "UTN.BA Helper (ex Siga Helper)",
   "short_name": "UTN.BA Helper",
-  "version": "6.4.0",
+  "version": "6.4.1",
   "description": "UTN.BA Helper facilita el uso de la web de la UTN - FRBA.",
   "author": "Pablo Matías Gomez",
   "icons": {