From a4a907a83f31add52be30a2730c71765ea86f4d0 Mon Sep 17 00:00:00 2001
From: Andreas Moik <moik@technikum-wien.at>
Date: Wed, 29 Jun 2016 15:04:41 +0200
Subject: [PATCH] bugfix

---
 vilesci/personen/aliquote_reduktion.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

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 @@
 					<tr>
 						<th ts-criteria="name" ts-default="ascending">Name</th>
 						<th ts-criteria="percent">Prozent</th>
-						<th ts-criteria="neededSum">Insgesamt benötigt</th>
+						<th ts-criteria="overallNeeded">Insgesamt benötigt</th>
 						<th ts-criteria="accepted">Bereits aufgenommen</th>
 						<th ts-criteria="needed">Noch benötigte Personen</th>
 					</tr>
@@ -495,7 +496,7 @@
 					<tr ng-repeat="zgv in aqr.zgvElems" ts-repeat ts-hide-no-data>
 						<td>{{zgv.name}}</td>
 						<td>{{zgv.percent | number: 2}}%</td>
-						<td>{{zgv.neededSum | parseInt}}</td>
+						<td>{{zgv.overallNeeded | parseInt}}</td>
 						<td>{{zgv.accepted}}</td>
 						<td>{{zgv.needed | parseInt}}</td>
 					</tr>