diff --git a/application/models/crm/Prestudent_model.php b/application/models/crm/Prestudent_model.php index 8b764d9d9..5afa98efe 100644 --- a/application/models/crm/Prestudent_model.php +++ b/application/models/crm/Prestudent_model.php @@ -362,13 +362,17 @@ class Prestudent_model extends DB_Model $bewerberarr = $this->getBewerber($person_id, $studiensemester); + //Prio can be added when prio is null and there is only one prestudent + if (count($bewerberarr) === 1 && !isset($prestudent->retval[0]->priorisierung) && $change < 0) + return true; + if (count($bewerberarr) <= 1) return false; if (!isset($prestudent->retval[0]->priorisierung)) { if ($change < 0) - return true; //null values can be changed to priority numbers, when there are other bewerber + return true; //null values can be changed to priority numbers (prority increase) else return false; } @@ -390,6 +394,7 @@ class Prestudent_model extends DB_Model } } + //no prio change when prestudent has max or min prio if (($currprio === $priomax && $change < 0) || ($currprio === $priomin && $change > 0)) { return false; @@ -459,7 +464,7 @@ class Prestudent_model extends DB_Model if (is_null($prestudent->retval[0]->priorisierung)) { - //if null value before, add lowest prio + //if null value, add as prio 1 $newprio = isset($neighbour->priorisierung) ? intval($neighbour->priorisierung) + 1 : 1; $result = $this->PrestudentModel->update( diff --git a/application/views/system/infocenter/zgvpruefungen.php b/application/views/system/infocenter/zgvpruefungen.php index 02fbe974c..e3e32483e 100644 --- a/application/views/system/infocenter/zgvpruefungen.php +++ b/application/views/system/infocenter/zgvpruefungen.php @@ -25,8 +25,13 @@ if (!$first) echo '
'; + + if (isEmptyString($studiensemester)): ?> -

+

ohne Semester

+ +

+
@@ -54,7 +59,6 @@ changeup) && $zgvpruefung->changeup === true; $changedown = isset($zgvpruefung->changedown) && $zgvpruefung->changedown === true; - if ($numberinteressenten[$studiensemester] > 1): echo ' | ' . ucfirst($this->p->t('infocenter', 'priorisierung')) . ': '; echo isset($zgvpruefung->priorisierung) ? $zgvpruefung->priorisierung : $this->p->t('global', 'nichtvorhanden'); if ($changeup): ?> @@ -63,7 +67,6 @@ -