From 8a98e8f1ad9552ec524f6afeace5f0925e85da33 Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Wed, 6 Jan 2021 20:26:55 +0100 Subject: [PATCH] Display remaining categories --- spec.js | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/spec.js b/spec.js index f727230..d4f99dc 100644 --- a/spec.js +++ b/spec.js @@ -33,8 +33,12 @@ parseExcel = async function (file) { } } let grade = /\((\d)\)(?!.*\(\d\))/.exec(row["Jegyek"]); - if (grade == null) - continue; + if (grade == null) { + const sign = row["Aláírás"]; + if (!sign) + continue; + grade = [, sign.startsWith("Aláírva") ? 5 : 1]; + } subject.grade = +grade[1]; subject.credit = +row["Kr."]; grades[id] = subject; @@ -82,11 +86,14 @@ parseExcel = async function (file) { szt -= kextra; } print(szabvalCat, szabvalCat.name, (total[szabvalCat.id] ?? 0) + szt); + } 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 } } }); - } catch - (ex) { + } catch (ex) { console.log(ex); } }