From 02401542d83b4ab60a708abb7002d352cd89fa45 Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Mon, 25 Jan 2021 21:23:48 +0100 Subject: [PATCH] Only count XT courses in separate semesters --- spec.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/spec.js b/spec.js index b8aab08..33f864d 100644 --- a/spec.js +++ b/spec.js @@ -93,7 +93,10 @@ parseExcel = async function (file) { } else { print(szakdogaCat, szakdogaCat.name, total[szakdogaCat.id] ?? 0); specsSpan.innerHTML += szakmaiCat.name + ": " + (Object.values(grades).find(cv => cv.categories.indexOf(szakmaiCat) !== -1 && cv.grade > 1) ? "Teljesitve" : "Nincs teljesitve") + "
"; - specsSpan.innerHTML += "Testnevelés: " + Object.values(grades).reduce((pv, cv) => cv.id.startsWith("XT") && cv.grade === 5 ? pv + 1 : pv, 0) + "/2 félév"; //TODO: Különböző félévben + specsSpan.innerHTML += "Testnevelés: " + Object.values(grades).reduce((pv, cv) => + cv.id.startsWith("XT") && cv.grade === 5 && + (cv.semester.firstYear !== pv[1]?.firstYear || cv.semester.num !== pv[1]?.num) + ? [pv[0] + 1, cv.semester] : pv, [0, null])[0] + "/2 félév"; } } let semester = Semester.current();