blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-20 00:12:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

bugfix

Browse Source
This commit is contained in:
Andreas Moik
2016-06-30 16:15:05 +02:00
parent a4a907a83f
commit 81ca197020
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vilesci/personen/aliquote_reduktion.php
+7 -7
View File
@@ -245,7 +245,7 @@
aqr.studenten.forEach(function(j)
{
if((j.applicant || j.selected))
if(j.rt_gesamtpunkte !== null && j.rt_gesamtpunkte > 0)
allCountedStudents.push(j);
});
@@ -253,33 +253,31 @@
if(applicantCount > allCountedStudents.length)
applicantCount = allCountedStudents.length;
zgvs.forEach(function(i)
{
var applicantsFromZGV = [];
aqr.studenten.forEach(function(j)
{
if((j.applicant || j.selected) && j.bezeichnung === i)
if((j.rt_gesamtpunkte !== null && j.rt_gesamtpunkte > 0) && j.bezeichnung === i)
applicantsFromZGV.push(j);
});
// calculate the aliquote reduction for every ZGV
var percent = applicantsFromZGV.length / allCountedStudents.length * 100;
var neededFromZGV = (applicantCount / 100 * percent);
var neededFromZGV = (applicantCount / 100 * percent) - aqr.getAcceptedCount(i);
if(neededFromZGV < 0)
neededFromZGV = 0;
zgvElems.push({name:i, needed:neededFromZGV, percent:percent, accepted: aqr.getAcceptedCount(i), overallNeeded: (applicantCount / 100 * percent) + aqr.getAcceptedCount(i)});
zgvElems.push({name:i, needed:neededFromZGV, percent:percent, accepted: aqr.getAcceptedCount(i), overallNeeded: neededFromZGV + aqr.getAcceptedCount(i)});
});
aqr.zgvElems = JSON.parse(JSON.stringify(zgvElems));
// calculate the already distributed students
var residual = 0;
zgvElems.forEach(function(i)
{
residual += i.needed;
residual += parseInt(i.needed);
});
// calculate the difference from needed to already distributed
@@ -292,11 +290,13 @@
{
if(resDiff > 0)
{
i.overallNeeded ++;
i.needed ++;
resDiff --;
}
});
}
aqr.zgvElems = JSON.parse(JSON.stringify(zgvElems));
aqr.recursiveChoose(neededStudentsCount, zgvElems);
}
}