diff --git a/vilesci/personen/aliquote_reduktion.php b/vilesci/personen/aliquote_reduktion.php index f3d9a8d1f..b06069349 100644 --- a/vilesci/personen/aliquote_reduktion.php +++ b/vilesci/personen/aliquote_reduktion.php @@ -257,6 +257,7 @@ zgvs.forEach(function(i) { var applicantsFromZGV = []; + aqr.studenten.forEach(function(j) { if((j.applicant || j.selected) && j.bezeichnung === i) @@ -265,12 +266,12 @@ // calculate the aliquote reduction for every ZGV var percent = applicantsFromZGV.length / allCountedStudents.length * 100; - var neededFromZGV = (applicantCount / 100 * percent) - aqr.getAcceptedCount(i); + var neededFromZGV = (applicantCount / 100 * percent); if(neededFromZGV < 0) neededFromZGV = 0; - zgvElems.push({name:i, needed:neededFromZGV, percent:percent, accepted: aqr.getAcceptedCount(i), neededSum: (applicantCount / 100 * percent)}); + zgvElems.push({name:i, needed:neededFromZGV, percent:percent, accepted: aqr.getAcceptedCount(i), overallNeeded: (applicantCount / 100 * percent) + aqr.getAcceptedCount(i)}); }); aqr.zgvElems = JSON.parse(JSON.stringify(zgvElems)); @@ -486,7 +487,7 @@ Name Prozent - Insgesamt benötigt + Insgesamt benötigt Bereits aufgenommen Noch benötigte Personen @@ -495,7 +496,7 @@ {{zgv.name}} {{zgv.percent | number: 2}}% - {{zgv.neededSum | parseInt}} + {{zgv.overallNeeded | parseInt}} {{zgv.accepted}} {{zgv.needed | parseInt}}