norbipeti/SZTE
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Nicer display and display more categories, credit calc

Browse source
This commit is contained in:
Norbi Peti 2021-01-06 19:53:18 +01:00
parent 27cba15afb
commit e1ef1fea5c
No known key found for this signature in database
GPG key ID: DBA4C4549A927E56
1 changed files with 45 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
spec.js
View file

@ -18,13 +18,19 @@ parseExcel = async function (file) {
const rows = XLSX.utils.sheet_to_row_object_array(workbook.Sheets[sheetName]); const rows = XLSX.utils.sheet_to_row_object_array(workbook.Sheets[sheetName]);
for (const row of rows) { for (const row of rows) {
let id = row["Tárgykód"]; let id = row["Tárgykód"];
const name = row["Tárgy címe, előadó neve"].replace(/,.*/, "");
if (!id.startsWith("IB0")) if (!id.startsWith("IB0"))
id = id.replaceAll(/[‑-]\d{5}/g, "").replaceAll(/‑/g, "-"); id = id.replaceAll(/[‑-]\d{5}/g, "");
id = row["Tárgy címe, előadó neve"].indexOf("tehetséggondozó") !== -1 ? id + "-TG" : id; id = id.replaceAll(/‑/g, "-");
const subject = subjects[id]; id = name.indexOf("tehetséggondozó") !== -1 ? id + "-TG" : id;
let subject = subjects[id];
if (!subject) { if (!subject) {
console.warn("Subject not found: " + id + " " + row["Tárgy címe, előadó neve"]); if (id.startsWith("X"))
continue; subject = new SubjectData(id, name, 0, [szabvalCat]);
else {
console.warn("Subject not found: " + id + " " + name);
continue;
}
} }
let grade = /\((\d)\)(?!.*\(\d\))/.exec(row["Jegyek"]); let grade = /\((\d)\)(?!.*\(\d\))/.exec(row["Jegyek"]);
if (grade == null) if (grade == null)
@ -44,10 +50,39 @@ parseExcel = async function (file) {
total[category.id] += sub.credit; total[category.id] += sub.credit;
} }
} }
const print = (cat, name, total, needed) => specsSpan.innerHTML += name + ": " + total + "/" + (needed ?? cat.neededCredit) + "<br />";
specsSpan.innerHTML = ""; specsSpan.innerHTML = "";
for (const tk of Object.keys(total)) { let kotvalTotal = 0;
const cat = tryGetCat(tk); for (const spec of specs) {
specsSpan.innerHTML += cat.name + ": " + total[tk] + "/" + cat.neededCredit + "<br />"; specsSpan.innerHTML += "<h3>" + spec.name + "</h3>";
const kvs = {"Matekos tárgyak": spec.matcat, "Infós tárgyak": spec.infcat};
let kextra = 0;
const neededExtra = 52 - spec.matcat.neededCredit - spec.infcat.neededCredit;
for (const key of Object.keys(kvs)) {
const value = kvs[key];
let tot = total[value.id];
if (spec === kotvalSpec)
kotvalTotal += tot;
if (spec !== kotSpec && neededExtra !== 0) {
if (tot > value.neededCredit) {
kextra += tot - value.neededCredit;
tot = value.neededCredit;
}
}
print(value, key, tot);
}
if (spec !== kotSpec) {
if (neededExtra !== 0) {
print(kotvalEgyebCat, kotvalEgyebCat.name, kextra, neededExtra);
}
let szt = 0;
if (spec !== kotvalSpec) {
szt = kotvalTotal - total[spec.matcat.id] - total[spec.infcat.id];
if (neededExtra !== 0)
szt -= kextra;
}
print(szabvalCat, szabvalCat.name, (total[szabvalCat.id] ?? 0) + szt);
}
} }
}); });
} catch } catch
@ -98,7 +133,8 @@ szak.onchange = async () => {
} }
let id = sdata[1]; let id = sdata[1];
if (!id.startsWith("IB0")) //IB0: speckol and such if (!id.startsWith("IB0")) //IB0: speckol and such
id = id.replaceAll(/[‑-]\d{5}/g, "").replaceAll(/‑/g, "-"); id = id.replaceAll(/[‑-]\d{5}/g, "");
id = id.replaceAll(/‑/g, "-");
id = sdata[2].indexOf("tehetséggondozó") !== -1 ? id + "-TG" : id; id = sdata[2].indexOf("tehetséggondozó") !== -1 ? id + "-TG" : id;
if (!subjects[id]) if (!subjects[id])
subjects[id] = new SubjectData(id, sdata[2], sdata[8], [cat]); subjects[id] = new SubjectData(id, sdata[2], sdata[8], [cat]);