Merge remote-tracking branch 'origin/master'

application/config/navigation.php

@@ -55,6 +55,12 @@ $config['navigation_header'] = array(
 					'description' => 'CIS',
 					'sort' => 10
 				),
+				'lehrveranstaltungen' => array(
+					'link' => site_url('lehre/lvplanung/LvTemplateUebersicht'),
+					'icon' => '',
+					'description' => 'Lehrveranstaltungen',
+					'sort' => 15
+				),
 				'reihungstest' => array(
 					'link' => site_url('organisation/Reihungstest'),
 					'description' => 'Reihungstests',
@@ -287,6 +293,15 @@ $config['navigation_menu']['lehre/lehrauftrag/LehrauftragErteilen/*'] = array(
 	)
 );
 
+$config['navigation_menu']['lehre/lvplanung/LvTemplateUebersicht/index'] = array(
+	'lvTemplateUebersicht' => array(
+		'link' => site_url('lehre/lvplanung/LvTemplateUebersicht'),
+		'description' => 'LV Template Übersicht',
+		'icon' => '',
+		'sort' => 1
+	)
+);
+
 $config['navigation_menu']['system/issues/Issues/*'] = array(
 	'fehlerzustaendigkeiten' => array(
 		'link' => site_url('system/issues/IssuesZustaendigkeiten'),

application/controllers/api/frontend/v1/checkperson/CheckPerson.php

@@ -0,0 +1,141 @@
+<?php
+/**
+ * Copyright (C) 2024 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class CheckPerson extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'updatePersonUnrulyStatus' => array('basis/mitarbeiter:rw', 'student/antragfreigabe:rw', 'student/studierendenantrag:rw'),
+			'filterPerson' => array('basis/mitarbeiter:rw', 'student/antragfreigabe:rw', 'student/studierendenantrag:rw'),
+			'checkUnruly' => array('basis/mitarbeiter:r', 'student/antragfreigabe:r', 'student/studierendenantrag:r', 'infocenter:r'),
+			'checkDuplicate' => array('infocenter:r'),
+		]);
+
+		$this->_ci =& get_instance();
+		$this->_ci->load->model('person/Person_model', 'PersonModel');
+	}
+
+	public function updatePersonUnrulyStatus()
+	{
+		$data = json_decode($this->input->raw_input_stream, true);
+
+		$person_id = $data['person_id'];
+		$unruly = $data['unruly'];
+
+		$result = $this->_ci->PersonModel->updateUnruly($person_id, $unruly);
+
+		if(isError($result)) {
+			$this->terminateWithError($result);
+		} else if (isSuccess($result)) {
+			$this->terminateWithSuccess($result);
+		}
+
+	}
+
+	public function checkDuplicate() {
+
+		$person_id = $this->input->post('person_id');
+
+		$result = $this->_ci->PersonModel->checkDuplicate($person_id);
+
+		if (isSuccess($result))
+			$this->terminateWithSuccess($result);
+		else
+			$this->terminateWithError('Error when searching for person');
+
+	}
+
+	// performs strict check over vorname, nachname, gebdatum
+	public function checkUnruly() {
+
+		$vorname = $this->input->post('vorname');
+		$nachname = $this->input->post('nachname');
+		$gebdatum = $this->input->post('gebdatum');
+
+		$result = $this->_ci->PersonModel->checkUnruly($vorname, $nachname, $gebdatum);
+
+		if (isSuccess($result))
+			$this->terminateWithSuccess($result);
+		else
+			$this->terminateWithError('Error when searching for person');
+	}
+
+	// filters nachname on similarity and vorname/gebdatum are optional
+	public function filterPerson() {
+		$payload = json_decode($this->input->raw_input_stream, TRUE);
+
+		$nachnameString = '';
+		$vornameString = '';
+		$filterUnruly = true;
+		$birthdateString = '';
+
+		if(array_key_exists( 'nachname', $payload) ) {
+			$nachnameString = $payload['nachname'];
+		}
+
+		if(array_key_exists('vorname', $payload)) {
+			$vornameString = $payload['vorname'];
+		}
+
+		if(array_key_exists('unruly', $payload)){
+			$filterUnruly = $payload['unruly'];
+		}
+
+		if(array_key_exists('gebdatum', $payload)) {
+			// TODO: enable if gebdatum filter for unrulys is desired
+//				$birthdateString = $payload['gebdatum'];
+		}
+
+		$parametersArray = array($nachnameString);
+		$where ="p.nachname~* ? ";
+		if (mb_strlen($nachnameString) == 2)
+		{
+			$where = "p.nachname=? ";
+		}
+
+		if(isset($vornameString) && $vornameString != '')
+		{
+			$where.= " AND p.vorname~*?";
+			$parametersArray[] = $vornameString;
+		}
+
+		if(isset($birthdateString) && $birthdateString != '')
+		{
+			$where.=" AND p.gebdatum=?";
+			$parametersArray[] = $birthdateString;
+		}
+
+		if(isset($filterUnruly))
+		{
+			$where.=" AND p.unruly=?";
+			$parametersArray[] = $filterUnruly;
+		}
+
+		$result = $this->_ci->PersonModel->checkUnrulyWhere($where, $parametersArray);
+
+		if (isSuccess($result))
+			$this->terminateWithSuccess($result);
+		else
+			$this->terminateWithError('Error when searching for person');
+
+
+	}
+}

application/controllers/api/frontend/v1/education/Lehrveranstaltung.php

@@ -0,0 +1,65 @@
+<?php
+/**
+ * FH-Complete
+ *
+ * @package		FHC-API
+ * @author		FHC-Team
+ * @copyright	Copyright (c) 2016, fhcomplete.org
+ * @license		GPLv3
+ * @link		http://fhcomplete.org
+ * @since		Version 1.0
+ * @filesource
+ */
+// ------------------------------------------------------------------------
+
+if (!defined('BASEPATH')) exit('No direct script access allowed');
+
+class Lehrveranstaltung extends FHCAPI_Controller
+{
+	/**
+	 * Lehrveranstaltung API constructor.
+	 */
+	public function __construct()
+	{
+		parent::__construct(array(
+			'getTemplateLvTree' => array(
+			    'lehre/lehrveranstaltung:rw'
+			)
+		));
+
+		// Load model LehrveranstaltungModel
+		$this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
+	}
+
+	/**
+	 * Get all Templates and union with all Lehrveranstaltungen of given Studiensemester and Oes of given Berechtigung,
+	 * that are assigned to a template. This data structure can be used for nested tabulators' data tree.
+	 *
+	 * @param null|string $studiensemester_kurzbz
+	 * @param null|string $berechtigung
+	 * @return array|stdClass|null
+	 */
+	public function getTemplateLvTree()
+	{
+		$studiensemester_kurzbz = $this->input->get('studiensemester_kurzbz');
+		$berechtigung = $this->input->get('berechtigung');
+
+		if ($berechtigung)
+		{
+			$oe_permissions = $this->permissionlib->getOE_isEntitledFor($berechtigung);
+			if(!$oe_permissions) $oe_permissions = [];
+
+			$result = $this->LehrveranstaltungModel->getTemplateLvTree($studiensemester_kurzbz, $oe_permissions);
+		}
+		else
+		{
+			$result = $this->LehrveranstaltungModel->getTemplateLvTree($studiensemester_kurzbz);
+		}
+
+		if (isError($result)) {
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_DB);
+		}
+
+		$this->terminateWithSuccess((getData($result) ?: []));
+	}
+}

application/controllers/api/frontend/v1/organisation/Studiensemester.php

@@ -0,0 +1,118 @@
+<?php
+/**
+ * FH-Complete
+ *
+ * @package		FHC-API
+ * @author		FHC-Team
+ * @copyright	Copyright (c) 2016, fhcomplete.org
+ * @license		GPLv3
+ * @link		http://fhcomplete.org
+ * @since		Version 1.0
+ * @filesource
+ */
+// ------------------------------------------------------------------------
+
+if (!defined('BASEPATH')) exit('No direct script access allowed');
+
+class Studiensemester extends FHCAPI_Controller
+{
+	/**
+	 * Studiensemester API constructor.
+	 */
+	public function __construct()
+	{
+		parent::__construct(
+			array(
+				'getAll' => self::PERM_LOGGED,
+				'getAktNext' => self::PERM_LOGGED
+			)
+		);
+		// Load model StudiensemesterModel
+		$this->load->model('organisation/studiensemester_model', 'StudiensemesterModel');
+	}
+
+	/**
+	 * Get all Studiensemester.
+	 *
+	 * @param null|string $order Sorting order for the Studiensemester, 'asc' or 'desc'. Defaults to 'asc'.
+	 * @param null|string $start Start date of the displayed Studiensemester in the format 'YYYY-MM-DD'.
+	 * 	If provided, only Studiensemester starting from this date onwards will be returned.
+	 *  eg. '2020-09-01' will start with WS2020.
+	 */
+	public function getAll()
+	{
+		$order = $this->input->get('order');
+		$start = $this->input->get('start');
+
+		if (strcasecmp($order, 'DESC') == 0)
+		{
+			$this->StudiensemesterModel->addOrder('ende', 'DESC');
+		}
+		else
+		{
+			$this->StudiensemesterModel->addOrder('ende', 'ASC');
+		}
+
+		if ($start)
+		{
+			$result = $this->StudiensemesterModel->loadWhere([
+				'start >= ' => $start
+			]);
+		}
+		else
+		{
+			$result = $this->StudiensemesterModel->load();
+		}
+
+		if (isError($result)) {
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_DB);
+		}
+
+		$this->terminateWithSuccess((getData($result) ?: []));
+	}
+
+	/**
+	 * @return void
+	 */
+	public function getAktNext()
+	{
+		$semester = $this->input->get('semester');
+
+		$result = null;
+
+		if (!is_numeric($semester))
+		{
+			$result = $this->StudiensemesterModel->loadWhere(array('start <=' => 'NOW()', 'ende >=' => 'NOW()'));
+		}
+
+		if (!hasData($result))
+		{
+			$this->StudiensemesterModel->addOrder('ende');
+			$this->StudiensemesterModel->addLimit(1);
+
+			$whereArray = array('ende >=' => 'NOW()');
+
+			if (is_numeric($semester))
+			{
+				if ($semester % 2 == 0)
+				{
+					$ss = 'SS';
+				}
+				else
+				{
+					$ss = 'WS';
+				}
+
+				$whereArray['SUBSTRING(studiensemester_kurzbz FROM 1 FOR 2) ='] = $ss;
+			}
+
+			$result = $this->StudiensemesterModel->loadWhere($whereArray);
+		}
+
+		if (isError($result)) {
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_DB);
+		}
+
+		$this->terminateWithSuccess((getData($result) ?: ''));
+	}
+}

application/controllers/api/frontend/v1/studstatus/Abmeldung.php

@@ -184,4 +184,4 @@ class Abmeldung extends FHCAPI_Controller
 		
 		$this->terminateWithSuccess($data);
 	}
-}
+}

application/controllers/api/v1/person/Person.php

@@ -264,4 +264,4 @@ class Person extends API_Controller
 
 		return success('Input data are valid');
 	}
-}
+}

application/controllers/lehre/Studierendenantrag.php

@@ -21,6 +21,7 @@ class Studierendenantrag extends FHC_Controller
 
 		// Load Models
 		$this->load->model('education/Studierendenantrag_model', 'StudierendenantragModel');
+		$this->load->model('person/Person_model', 'PersonModel');
 
 		// Load language phrases
 		$this->loadPhrases([
@@ -102,6 +103,7 @@ class Studierendenantrag extends FHC_Controller
 
 	public function abmeldungstgl($prestudent_id, $studierendenantrag_id = null)
 	{
+
 		$this->load->view('lehre/Antrag/Create', [
 			'prestudent_id' => $prestudent_id,
 			'studierendenantrag_id' => $studierendenantrag_id,
@@ -185,4 +187,4 @@ class Studierendenantrag extends FHC_Controller
 
 		return $strRequiredPermissions;
 	}
-}
+}

application/controllers/lehre/lvplanung/LvTemplateUebersicht.php

@@ -0,0 +1,45 @@
+<?php
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class LvTemplateUebersicht extends Auth_Controller
+{
+	public function __construct()
+	{
+		// Set required permissions
+		parent::__construct(
+			array(
+				'index' => 'lehre/lehrveranstaltung:rw',
+			)
+		);
+
+		// Load libraries
+		$this->load->library('AuthLib');
+
+
+		// Load language phrases
+		$this->loadPhrases(
+			array(
+				'global',
+				'lehre'
+			)
+		);
+
+		$this->_setAuthUID();
+	}
+
+	public function index()
+	{
+		$this->load->view('lehre/lvplanung/lvTemplateUebersicht.php');
+	}
+
+
+	/**
+	 * Retrieve the UID of the logged user and checks if it is valid
+	 */
+	private function _setAuthUID()
+	{
+		$this->_uid = getAuthUID();
+
+		if (!$this->_uid) show_error('User authentification failed');
+	}
+}

application/controllers/system/infocenter/InfoCenter.php

@@ -337,10 +337,13 @@ class InfoCenter extends Auth_Controller
 		$persondata = $this->_loadPersonData($person_id);
 
 		$checkPerson = $this->PersonModel->checkDuplicate($person_id);
-
 		if (isError($checkPerson)) show_error(getError($checkPerson));
 
-		$duplicate = array('duplicated' => getData($checkPerson));
+		$checkUnruly = $this->PersonModel->checkUnruly($persondata['stammdaten']->vorname, $persondata['stammdaten']->nachname, $persondata['stammdaten']->gebdatum);
+		if (isError($checkUnruly)) show_error(getError($checkUnruly));
+
+		$duplicate = array('duplicate' => getData($checkPerson));
+		$unruly = array('unruly' => getData($checkUnruly));
 
 		$prestudentdata = $this->_loadPrestudentData($person_id);
 
@@ -351,7 +354,8 @@ class InfoCenter extends Auth_Controller
 			$persondata,
 			$prestudentdata,
 			$dokumentdata,
-			$duplicate
+			$duplicate,
+			$unruly
 		);
 
 		$data[self::FHC_CONTROLLER_ID] = $this->getControllerId();
@@ -1285,67 +1289,28 @@ class InfoCenter extends Auth_Controller
 			$this->terminateWithJsonError($this->p->t('ui', 'fehlerBeimSpeichern'));
 
 		$kontakte = $this->input->post('kontakt');
-		foreach ($kontakte as $kontakt)
-		{
-			$kontaktExists = $this->KontaktModel->loadWhere(array(
-				'kontakt_id' => $kontakt['id'],
-				'person_id' => $person_id,
-			));
+		if($kontakte) {
 
-			if (hasData($kontaktExists))
-			{
-				$kontaktExists = getData($kontaktExists)[0];
+			foreach ($kontakte as $kontakt) {
+				$kontaktExists = $this->KontaktModel->loadWhere(array(
+					'kontakt_id' => $kontakt['id'],
+					'person_id' => $person_id,
+				));
 
-				if ($kontaktExists->kontakt === $kontakt['value'])
-					continue;
+				if (hasData($kontaktExists)) {
+					$kontaktExists = getData($kontaktExists)[0];
 
-				$update = $this->KontaktModel->update(
-					array
-					(
-						'kontakt_id' => $kontakt['id']
-					),
-					array
-					(
-						'kontakt' => isEmptyString($kontakt['value']) ? null : $kontakt['value'],
-						'updateamum' => date('Y-m-d H:i:s'),
-						'updatevon' => $this->_uid
-					)
-				);
+					if ($kontaktExists->kontakt === $kontakt['value'])
+						continue;
 
-				if (isError($update))
-					$this->terminateWithJsonError($this->p->t('ui', 'fehlerBeimSpeichern'));
-			}
-		}
-
-		$adressen = $this->input->post('adresse');
-
-		foreach ($adressen as $adresse)
-		{
-			$adresseExists = $this->AdresseModel->loadWhere(array(
-				'adresse_id' => $adresse['id'],
-				'person_id' => $person_id,
-			));
-
-			if (hasData($adresseExists))
-			{
-				$adresse = $adresse['value'];
-				$adresseExists = getData($adresseExists)[0];
-				if ($adresseExists->strasse !== $adresse['strasse'] ||
-					$adresseExists->plz !== $adresse['plz'] ||
-					$adresseExists->ort !== $adresse['ort'] ||
-					$adresseExists->nation !== $adresse['nation'])
-				{
-					$update = $this->AdresseModel->update(
+					$update = $this->KontaktModel->update(
 						array
 						(
-							'adresse_id' => $adresseExists->adresse_id
+							'kontakt_id' => $kontakt['id']
 						),
 						array
 						(
-							'strasse' => isEmptyString($adresse['strasse']) ? null : $adresse['strasse'],
-							'plz' => isEmptyString($adresse['plz']) ? null : $adresse['plz'],
-							'ort' => isEmptyString($adresse['ort']) ? null : $adresse['ort'],
-							'nation' => isEmptyString($adresse['nation']) ? null : $adresse['nation'],
+							'kontakt' => isEmptyString($kontakt['value']) ? null : $kontakt['value'],
 							'updateamum' => date('Y-m-d H:i:s'),
 							'updatevon' => $this->_uid
 						)
@@ -1354,7 +1319,48 @@ class InfoCenter extends Auth_Controller
 					if (isError($update))
 						$this->terminateWithJsonError($this->p->t('ui', 'fehlerBeimSpeichern'));
 				}
+			}
 
+		}
+
+		$adressen = $this->input->post('adresse');
+
+		if($adressen) {
+
+			foreach ($adressen as $adresse) {
+				$adresseExists = $this->AdresseModel->loadWhere(array(
+					'adresse_id' => $adresse['id'],
+					'person_id' => $person_id,
+				));
+
+				if (hasData($adresseExists)) {
+					$adresse = $adresse['value'];
+					$adresseExists = getData($adresseExists)[0];
+					if ($adresseExists->strasse !== $adresse['strasse'] ||
+						$adresseExists->plz !== $adresse['plz'] ||
+						$adresseExists->ort !== $adresse['ort'] ||
+						$adresseExists->nation !== $adresse['nation']) {
+						$update = $this->AdresseModel->update(
+							array
+							(
+								'adresse_id' => $adresseExists->adresse_id
+							),
+							array
+							(
+								'strasse' => isEmptyString($adresse['strasse']) ? null : $adresse['strasse'],
+								'plz' => isEmptyString($adresse['plz']) ? null : $adresse['plz'],
+								'ort' => isEmptyString($adresse['ort']) ? null : $adresse['ort'],
+								'nation' => isEmptyString($adresse['nation']) ? null : $adresse['nation'],
+								'updateamum' => date('Y-m-d H:i:s'),
+								'updatevon' => $this->_uid
+							)
+						);
+
+						if (isError($update))
+							$this->terminateWithJsonError($this->p->t('ui', 'fehlerBeimSpeichern'));
+					}
+
+				}
 			}
 		}
 
@@ -2383,4 +2389,4 @@ class InfoCenter extends Auth_Controller
 
 		$this->outputJsonSuccess("Success");
 	}
-}
+}

application/libraries/AntragLib.php

@@ -930,7 +930,7 @@ class AntragLib
 	public function createWiederholung($prestudent_id, $studiensemester_kurzbz, $insertvon, $repeat)
 	{
 		$result = $this->_ci->StudierendenantragModel->loadIdAndStatusWhere([
-			'prestudent_id' => $prestudent_id,
+			'tbl_studierendenantrag.prestudent_id' => $prestudent_id,
 			'studiensemester_kurzbz'=> $studiensemester_kurzbz,
 			'typ' => Studierendenantrag_model::TYP_WIEDERHOLUNG
 		]);
@@ -1360,7 +1360,7 @@ class AntragLib
 
 		if (!in_array($result->status_kurzbz, $this->_ci->config->item('antrag_prestudentstatus_whitelist_abmeldung'))) {
 			$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere([
-				'prestudent_id' => $prestudent_id,
+				'tbl_studierendenantrag.prestudent_id' => $prestudent_id,
 				's.studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_APPROVED
 			], [
 				Studierendenantrag_model::TYP_ABMELDUNG,
@@ -1372,7 +1372,7 @@ class AntragLib
 				return success(-1);
 
 			$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere([
-				'prestudent_id' => $prestudent_id,
+				'tbl_studierendenantrag.prestudent_id' => $prestudent_id,
 				's.studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_PAUSE
 			], [
 				Studierendenantrag_model::TYP_ABMELDUNG,
@@ -1386,7 +1386,7 @@ class AntragLib
 			return success(0);
 		}
 
-		$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere(['prestudent_id' => $prestudent_id]);
+		$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere(['tbl_studierendenantrag.prestudent_id' => $prestudent_id]);
 		if (isError($result))
 			return $result;
 		if (!hasData($result))
@@ -1447,7 +1447,7 @@ class AntragLib
 			&& $result->status_kurzbz != 'Unterbrecher') {
 			return success(0);
 		}
-		$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere(['prestudent_id' => $prestudent_id]);
+		$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere(['tbl_studierendenantrag.prestudent_id' => $prestudent_id]);
 		if (isError($result))
 			return $result;
 		if (!hasData($result))
@@ -1463,12 +1463,6 @@ class AntragLib
 				elseif($antrag->status == Studierendenantragstatus_model::STATUS_APPROVED && $antrag->datum > $datumStatus)
 					return success(-2);
 			}
-			if ($antrag->typ == Studierendenantrag_model::TYP_UNTERBRECHUNG)
-			{
-				// NOTE(chris): Ignore canceled ones
-				if ($antrag->status == Studierendenantragstatus_model::STATUS_CANCELLED)
-					continue;
-			}
 			if ($antrag->typ == Studierendenantrag_model::TYP_WIEDERHOLUNG)
 			{
 				if($antrag->status == Studierendenantragstatus_model::STATUS_PASS)
@@ -1529,7 +1523,7 @@ class AntragLib
 		$datumStatus = $result->datum;
 		if (!in_array($result->status_kurzbz, $this->_ci->config->item('antrag_prestudentstatus_whitelist'))) {
 			$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere([
-				'prestudent_id' => $prestudent_id,
+				'tbl_studierendenantrag.prestudent_id' => $prestudent_id,
 				'typ' => Studierendenantrag_model::TYP_WIEDERHOLUNG,
 				's.studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_APPROVED
 			]);
@@ -1539,7 +1533,7 @@ class AntragLib
 				return success(-1);
 
 			$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere([
-				'prestudent_id' => $prestudent_id,
+				'tbl_studierendenantrag.prestudent_id' => $prestudent_id,
 				'typ' => Studierendenantrag_model::TYP_WIEDERHOLUNG,
 				's.studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_DEREGISTERED
 			]);
@@ -1549,7 +1543,7 @@ class AntragLib
 				return success(-1);
 
 			$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere([
-				'prestudent_id' => $prestudent_id,
+				'tbl_studierendenantrag.prestudent_id' => $prestudent_id,
 				'typ' => Studierendenantrag_model::TYP_WIEDERHOLUNG,
 				's.studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_PAUSE
 			]);
@@ -1560,7 +1554,7 @@ class AntragLib
 
 			return success(0);
 		}
-		$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere(['prestudent_id' => $prestudent_id]);
+		$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere(['tbl_studierendenantrag.prestudent_id' => $prestudent_id]);
 		if (isError($result))
 			return $result;
 		if (!hasData($result))
@@ -1613,7 +1607,7 @@ class AntragLib
 	public function getDetailsForLastAntrag($prestudent_id, $typ = null)
 	{
 		$where = [
-			'prestudent_id' => $prestudent_id
+			'tbl_studierendenantrag.prestudent_id' => $prestudent_id
 		];
 		$types = null;
 		if ($typ) {
@@ -2199,4 +2193,4 @@ class AntragLib
 		$result = $this->_ci->StudierendenantraglehrveranstaltungModel->getLvsForPrestudent($prestudent_id, $studiensemester_kurzbz);
 		return $result;
 	}
-}
+}

application/libraries/PrestudentLib.php

@@ -254,7 +254,7 @@ class PrestudentLib
 
 			$studiengang = current(getData($res));
 			$prestudent_status = current($result);
-			if($prestudent_status->ausbildungssemester + 1 < $studiengang->max_semester)
+			if ($prestudent_status->status_kurzbz != Prestudentstatus_model::STATUS_UNTERBRECHER && $prestudent_status->ausbildungssemester + 1 < $studiengang->max_semester)
 				$ausbildungssemester_plus = 1;
 
 			if(!$result)
@@ -264,6 +264,35 @@ class PrestudentLib
 					'studiensemester_kurzbz' => $studiensemester_kurzbz
 				]));
 			}
+		} elseif (current($result)->status_kurzbz == Prestudentstatus_model::STATUS_UNTERBRECHER) {
+			if ($studierendenantrag_id)
+			{
+				$resultAntrag = $this->_ci->StudierendenantragModel->load($studierendenantrag_id);
+				if (isError($resultAntrag))
+					return $resultAntrag;
+				$resultAntrag = getData($resultAntrag);
+				if (!$resultAntrag)
+					return error($this->_ci->p->t('studierendenantrag', 'error_no_antrag_found', ['id' => $studierendenantrag_id]));
+
+				$antrag = current($resultAntrag);
+				$anmerkung = current($result)->anmerkung . ' Wiedereinstieg ' . $antrag->datum_wiedereinstieg;
+
+				$result = $this->_ci->PrestudentstatusModel->update([
+					'prestudent_id' => $prestudent_id,
+					'status_kurzbz' => Prestudentstatus_model::STATUS_UNTERBRECHER,
+					'studiensemester_kurzbz' => $studiensemester_kurzbz,
+					'ausbildungssemester' => current($result)->ausbildungssemester
+				], [
+					'updatevon' => $insertvon,
+					'updateamum' => date('c'),
+					'anmerkung'=> $anmerkung
+				]);
+
+				if (isError($result))
+					return $result;
+			}
+
+			return success();
 		}
 
 		$prestudent_status = current($result);

application/libraries/issues/PlausicheckDefinitionLib.php

@@ -15,7 +15,6 @@ class PlausicheckDefinitionLib
 		'AktSemesterNull' => 'AktSemesterNull',
 		'AktiverStudentOhneStatus' => 'AktiverStudentOhneStatus',
 		'AusbildungssemPrestudentUngleichAusbildungssemStatus' => 'AusbildungssemPrestudentUngleichAusbildungssemStatus',
-		'BewerberNichtZumRtAngetreten' => 'BewerberNichtZumRtAngetreten',
 		'DatumAbschlusspruefungFehlt' => 'DatumAbschlusspruefungFehlt',
 		'DatumSponsionFehlt' => 'DatumSponsionFehlt',
 		'DatumStudiensemesterFalscheReihenfolge' => 'DatumStudiensemesterFalscheReihenfolge',
@@ -36,6 +35,7 @@ class PlausicheckDefinitionLib
 		'StudentstatusNachAbbrecher' => 'StudentstatusNachAbbrecher',
 		'DualesStudiumOhneMarkierung' => 'DualesStudiumOhneMarkierung'
 		//'StudienplanUngueltig' => 'StudienplanUngueltig'
+		//'BewerberNichtZumRtAngetreten' => 'BewerberNichtZumRtAngetreten'
 	);
 
 	/**

application/libraries/vertragsbestandteil/Gehaltsbestandteil.php

@@ -201,6 +201,10 @@ class Gehaltsbestandteil extends AbstractBestandteil implements \JsonSerializabl
 
 	public function setGrundbetrag($grundbetrag)
 	{
+		if(is_float($grundbetrag))
+		{
+		    $grundbetrag = number_format($grundbetrag, 2, '.', '');
+		}
 		$this->markDirty('grundbetrag', $this->grundbetrag, $grundbetrag);
 		$this->grundbetrag = $grundbetrag;
 		return $this;
@@ -208,6 +212,10 @@ class Gehaltsbestandteil extends AbstractBestandteil implements \JsonSerializabl
 
 	public function setBetrag_valorisiert($betrag_valorisiert)
 	{
+		if(is_float($betrag_valorisiert))
+		{
+		    $betrag_valorisiert = number_format($betrag_valorisiert, 2, '.', '');
+		}
 		$this->markDirty('betrag_valorisiert', $this->betrag_valorisiert, $betrag_valorisiert);
 		$this->betrag_valorisiert = $betrag_valorisiert;
 		return $this;

application/models/codex/Bismeldestichtag_model.php

@@ -33,6 +33,23 @@ class Bismeldestichtag_model extends DB_Model
 		]);
 	}
 
+	/**
+	 * Liefert nächstliegenden Bismeldestichtag.
+	 * @return object success or error
+	 */
+	public function getNextMeldestichtag()
+	{
+		$this->addSelect('meldestichtag');
+		$this->addSelect('studiensemester_kurzbz');
+
+		$this->addOrder('meldestichtag', 'ASC');
+		$this->addLimit(1);
+
+		return $this->loadWhere([
+			'meldestichtag >= NOW()' => null
+		]);
+	}
+
 	/**
 	 * Prüft, ob Meldestichtag für ein bestimmtes Statusdatum und Studiensemester erreicht ist.
 	 *

application/models/crm/Prestudentstatus_model.php

@@ -289,6 +289,7 @@ class Prestudentstatus_model extends DB_Model
 		$this->addSelect('ss.studienjahr_kurzbz');
 		$this->addSelect('pers.vorname');
 		$this->addSelect('pers.nachname');
+		$this->addSelect('pers.unruly');
 		$this->addSelect('TRIM(CONCAT(pers.vorname, \' \', pers.nachname)) AS name');
 		$this->addSelect('pers.person_id');
 		$this->addSelect('g.studiengang_kz');
@@ -571,12 +572,12 @@ class Prestudentstatus_model extends DB_Model
 		$this->addOrder('tbl_prestudentstatus.datum', 'DESC');
 		$this->addOrder('tbl_prestudentstatus.insertamum', 'DESC');
 		$this->addOrder('tbl_prestudentstatus.ext_id', 'DESC');
-		
+
 		$this->addLimit(1);
 
 		$this->db->where('prestudent_id', $prestudent_id);
 		$this->db->where('status_kurzbz', self::STATUS_STUDENT);
-		
+
 		$sql = $this->db->get_compiled_select($this->dbTable);
 
 		$this->addJoin('lehre.tbl_studienplan plan', 'studienplan_id', 'LEFT');
@@ -587,4 +588,4 @@ class Prestudentstatus_model extends DB_Model
 			'status_kurzbz' => self::STATUS_BEWERBER
 		]);
 	}
-}
+}

application/models/education/Lehrveranstaltung_model.php

@@ -15,6 +15,297 @@ class Lehrveranstaltung_model extends DB_Model
 		$this->load->model('organisation/studiensemester_model', 'StudiensemesterModel');
 	}
 
+	/**
+	 * Get Lehrveranstaltungen by eventQuery string. Use with autocomplete event queries.
+	 * @param $eventQuery String
+	 * @param string $studiensemester_kurzbz Filter by Studiensemester
+	 * @param array $oes Filter by Organisationseinheiten
+	 * @return array
+	 */
+	public function getAutocompleteSuggestions($eventQuery, $studiensemester_kurzbz = null, $oes = null)
+	{
+		$subQry = $this->_getQryLvsByStudienplan($studiensemester_kurzbz, $oes);
+		$params = [];
+
+		/* filter by input string */
+		if (is_string($eventQuery)) {
+			$subQry.= ' AND lv.bezeichnung ILIKE ?';
+			$params[] = '%' . $eventQuery . '%';
+		}
+
+		$qry = 'SELECT DISTINCT ON (lehrveranstaltung_id) * FROM ('. $subQry. ') AS tmp';
+
+		return $this->execQuery($qry, $params);
+	}
+
+	/**
+	 * Get Lehrveranstaltungen with its Stg, OE and OE-type.
+	 * Filter by Studiensemester and Organisationseinheiten if necessary.
+	 * @param $eventQuery String
+	 * @param string $studiensemester_kurzbz Filter by Studiensemester
+	 * @param array $oes Filter by Organisationseinheiten
+	 * @param array $lv_ids Filter by Lehrveranstaltung-Ids
+	 * @return array
+	 */
+	public function getLvsByStudienplan($studiensemester_kurzbz = null, $oes = null, $lv_ids = null)
+	{
+		$subQry = $this->_getQryLvsByStudienplan($studiensemester_kurzbz, $oes);
+		$qry = 'SELECT * FROM ('. $subQry. ') AS tmp';
+
+		if (isset($lv_ids) && is_array($lv_ids))
+		{
+			/* filter by lv_ids */
+			$implodedLvIds = "'". implode("', '", $lv_ids). "'";
+			$qry.= ' WHERE lehrveranstaltung_id IN ('. $implodedLvIds. ')';
+		}
+
+		$qry.= ' ORDER BY stg_typ_kurzbz, orgform_kurzbz DESC';
+
+		return $this->execQuery($qry);
+	}
+
+	/**
+	 * Get basic query to retrieve Lehrveranstaltungen according to the Orgforms and Ausbildungssemesters actual Studienplan.
+	 *
+	 * @return string
+	 */
+	private function _getQryLvsByStudienplan($studiensemester_kurzbz = null, $oes = null,  $lehrtyp_kurzbz = 'lv')
+	{
+		$qry = '
+			SELECT
+				lv.oe_kurzbz AS lv_oe_kurzbz,
+				CASE
+                    WHEN oe.organisationseinheittyp_kurzbz = \'Kompetenzfeld\' THEN (\'KF \' || oe.bezeichnung)
+                    WHEN oe.organisationseinheittyp_kurzbz = \'Department\' THEN (\'DEP \' || oe.bezeichnung)
+                    ELSE (oe.organisationseinheittyp_kurzbz || \' \' || oe.bezeichnung)
+                END AS lv_oe_bezeichnung,
+				stplsem.studiensemester_kurzbz,
+				studienordnung_id,
+				sto.studiengang_kz,
+				stpl.studienplan_id,
+				stplsem.semester,
+				stpl.orgform_kurzbz,
+				upper(stg.typ || stg.kurzbz) AS stg_typ_kurzbz,    
+				stg.bezeichnung AS stg_bezeichnung,
+				stgtyp.bezeichnung AS stg_typ_bezeichnung,
+			    lv.lehrveranstaltung_id,
+				lv.semester,   		
+				lv.bezeichnung AS lv_bezeichnung,
+				(
+				    -- comma seperated string of all lehreinheitgruppen
+					SELECT string_agg(bezeichnung, \', \') AS lehreinheitgruppe_bezeichnung
+					FROM(
+					    -- distinct bezeichnung, as may come multiple times from different lehreinheiten
+						SELECT DISTINCT ON (studiengang_kz, bezeichnung) studiengang_kz, bezeichnung FROM
+						(
+							-- distinct lehreinheitgruppe, as may come multiple times from different lehrform
+							SELECT DISTINCT ON (legr.lehreinheitgruppe_id) legr.studiengang_kz,
+								-- get Spezialgruppe or Lehrverbandgruppe 
+								COALESCE(
+									legr.gruppe_kurzbz,
+									CONCAT( UPPER(stg1.typ), UPPER(stg1.kurzbz), \'-\', legr.semester, legr.verband, legr.gruppe )
+								) as bezeichnung
+							FROM lehre.tbl_lehreinheitgruppe 	legr
+							JOIN lehre.tbl_lehreinheit 			le USING (lehreinheit_id)
+							JOIN lehre.tbl_lehrveranstaltung 	lv1 USING (lehrveranstaltung_id)
+							JOIN public.tbl_studiengang 		stg1 ON stg1.studiengang_kz = legr.studiengang_kz
+							WHERE lv1.lehrveranstaltung_id 		= lv.lehrveranstaltung_id
+							AND le.studiensemester_kurzbz 		= stplsem.studiensemester_kurzbz
+						) AS lehreinheitgruppen
+					    GROUP BY studiengang_kz, bezeichnung
+						ORDER BY studiengang_kz DESC
+					) AS uniqueLehreinheitgruppen_bezeichnung
+				) AS lehreinheitgruppen_bezeichnung
+            FROM
+				lehre.tbl_studienplan 							stpl
+				JOIN lehre.tbl_studienordnung 					sto USING (studienordnung_id)
+				JOIN lehre.tbl_studienplan_semester 			stplsem USING (studienplan_id)
+				JOIN lehre.tbl_studienplan_lehrveranstaltung 	stpllv ON (stpllv.studienplan_id = stpl.studienplan_id AND stpllv.semester = stplsem.semester)
+				JOIN lehre.tbl_lehrveranstaltung 				lv USING (lehrveranstaltung_id)
+				JOIN public.tbl_organisationseinheit 			oe USING (oe_kurzbz)
+				JOIN public.tbl_studiengang          			stg ON stg.studiengang_kz = sto.studiengang_kz
+				JOIN public.tbl_studiengangstyp 				stgtyp ON stgtyp.typ = stg.typ
+			/* filter by lehrtyp_kurzbz, default is lvs only */
+			WHERE 
+			      lehrtyp_kurzbz = '. $this->db->escape($lehrtyp_kurzbz);
+
+		if (isset($studiensemester_kurzbz) && is_string($studiensemester_kurzbz))
+		{
+			/* filter by studiensemester */
+			$qry.= ' AND stplsem.studiensemester_kurzbz = '. $this->db->escape($studiensemester_kurzbz);
+
+		}
+
+		if (isset($oes) && is_array($oes))
+		{
+			/* filter by organisationseinheit */
+			$implodedOes = "'". implode("', '", $oes). "'";
+			$qry.= ' AND lv.oe_kurzbz IN ('. $implodedOes. ')';
+		}
+
+		return $qry;
+	}
+
+	/**
+	 * Get all Templates and union with all Lehrveranstaltungen of given Studiensemester and Oes, that are assigned to
+	 * a template. This data structure can be used for nested tabulator data tree.
+	 *
+	 * @param null|string $studiensemester_kurzbz
+	 * @param null|array $oes
+	 * @return array|stdClass|null
+	 */
+	public function getTemplateLvTree($studiensemester_kurzbz = null, $oes = null){
+		$params = [];
+		$qry = '
+		WITH 	
+			-- All Lvs that are assigned to a template in given Studiensemester for given Oes
+			-- joining via actual Studienplan
+			standardisierteLvs AS (
+				SELECT
+					lv.*,
+					stpl.studienplan_id::text as studienplan_id,
+					stpl.bezeichnung AS studienplan_bezeichnung,
+					stplsem.studiensemester_kurzbz
+				FROM
+					lehre.tbl_studienplan 							stpl
+					JOIN lehre.tbl_studienordnung 					sto USING (studienordnung_id)
+					JOIN lehre.tbl_studienplan_semester 			stplsem USING (studienplan_id)
+					JOIN lehre.tbl_studienplan_lehrveranstaltung 	stpllv ON (stpllv.studienplan_id = stpl.studienplan_id AND stpllv.semester = stplsem.semester)
+					JOIN lehre.tbl_lehrveranstaltung 				lv USING (lehrveranstaltung_id)
+					JOIN public.tbl_organisationseinheit 			oe USING (oe_kurzbz)
+					JOIN public.tbl_studiengang          			stg ON stg.studiengang_kz = sto.studiengang_kz
+					JOIN public.tbl_studiengangstyp 				stgtyp ON stgtyp.typ = stg.typ
+				WHERE 
+					-- filter type lv
+				  	lehrtyp_kurzbz = \'lv\'
+				  	-- filter lvs assigned to template (= standardisierte lv)
+					AND lehrveranstaltung_template_id IS NOT NULL';
+
+					if (is_string($studiensemester_kurzbz))
+					{
+						/* filter by studiensemester */
+						$params[]= $studiensemester_kurzbz;
+						$qry.= ' AND stplsem.studiensemester_kurzbz = ? ';
+
+					}
+
+					if (is_array($oes))
+					{
+						/* filter by organisationseinheit */
+						$params[]= $oes;
+						$qry.= ' AND lv.oe_kurzbz IN ? ';
+					}
+		$qry.= '
+			),
+			-- All templates
+			templateLvs AS (
+				SELECT 
+					lv.*,
+					NULL AS studienplan_id,
+					(
+						SELECT string_agg(stpl_bezeichnung, \', \')
+						FROM
+						(
+							SELECT stlv.studienplan_bezeichnung AS stpl_bezeichnung
+							FROM standardisierteLvs stlv
+							WHERE stlv.lehrveranstaltung_template_id = lv.lehrveranstaltung_id
+						) AS studienplaene
+					) AS studienplan_bezeichnung,
+					NULL AS studiensemester_kurzbz
+				FROM 
+					lehre.tbl_lehrveranstaltung lv
+				WHERE 
+					-- filter type template
+					lehrtyp_kurzbz = \'tpl\'
+					-- filter semester that were retrieved by standardisierte lvs semester for selected studiensemester
+					AND EXISTS (
+						SELECT 1
+						FROM standardisierteLvs std
+						WHERE std.lehrveranstaltung_template_id = lv.lehrveranstaltung_id
+					)';
+
+		if (is_array($oes))
+		{
+			/* filter by organisationseinheit */
+			$params[]= $oes;
+			$qry.= ' AND lv.oe_kurzbz IN ? ';
+		}
+		$qry.= '
+			)	
+		';
+
+		$qry.= '
+			SELECT 
+				lv.lehrveranstaltung_id,
+				lv.kurzbz,
+			    lv.lehrtyp_kurzbz,
+				lv.bezeichnung AS lv_bezeichnung, 
+				lv.bezeichnung_english,
+				lv.studiengang_kz,
+				lv.semester,
+				lv.oe_kurzbz,
+				lv.ects,
+				lv.lehrform_kurzbz,
+				lv.orgform_kurzbz,
+				lv.sprache, 
+				lv.aktiv,
+				lv.lehrveranstaltung_template_id,
+				lv.studienplan_id,
+			    lv.studienplan_bezeichnung,
+			    lv.studiensemester_kurzbz,
+			    upper(stg.typ || stg.kurzbz) AS "stg_typ_kurzbz",    
+				stg.bezeichnung AS "stg_bezeichnung",
+				stgtyp.bezeichnung AS "stg_typ_bezeichnung",
+				CASE
+   			 		WHEN oe.organisationseinheittyp_kurzbz = \'Kompetenzfeld\' THEN (\'KF \' || oe.bezeichnung)
+                    WHEN oe.organisationseinheittyp_kurzbz = \'Department\' THEN (\'DEP \' || oe.bezeichnung)
+                    ELSE (oe.organisationseinheittyp_kurzbz || \' \' || oe.bezeichnung)
+                END AS "lv_oe_bezeichnung",
+			   (
+				    -- comma seperated string of all lehreinheitgruppen
+					SELECT string_agg(bezeichnung, \', \') AS lehreinheitgruppe_bezeichnung
+					FROM(
+					    -- distinct bezeichnung, as may come multiple times from different lehreinheiten
+						SELECT DISTINCT ON (studiengang_kz, bezeichnung) studiengang_kz, bezeichnung FROM
+						(
+							-- distinct lehreinheitgruppe, as may come multiple times from different lehrform
+							SELECT DISTINCT ON (legr.lehreinheitgruppe_id) legr.studiengang_kz,
+								-- get Spezialgruppe or Lehrverbandgruppe 
+								COALESCE(
+									legr.gruppe_kurzbz,
+									CONCAT( UPPER(stg1.typ), UPPER(stg1.kurzbz), \'-\', legr.semester, legr.verband, legr.gruppe )
+								) as bezeichnung
+							FROM lehre.tbl_lehreinheitgruppe 	legr
+							JOIN lehre.tbl_lehreinheit 			le USING (lehreinheit_id)
+							JOIN lehre.tbl_lehrveranstaltung 	lv1 USING (lehrveranstaltung_id)
+							JOIN public.tbl_studiengang 		stg1 ON stg1.studiengang_kz = legr.studiengang_kz
+							WHERE lv1.lehrveranstaltung_id 		= lv.lehrveranstaltung_id
+							AND le.studiensemester_kurzbz 		= lv.studiensemester_kurzbz
+						) AS lehreinheitgruppen
+					    GROUP BY studiengang_kz, bezeichnung
+						ORDER BY studiengang_kz DESC
+					) AS uniqueLehreinheitgruppen_bezeichnung
+				) AS lehreinheitgruppen_bezeichnung
+			FROM (
+				SELECT 
+					* 
+				FROM 
+				     standardisierteLvs 
+				UNION
+				SELECT 
+				   * 
+				FROM templateLvs 
+			) AS lv
+				JOIN public.tbl_studiengang          	stg ON stg.studiengang_kz = lv.studiengang_kz
+				JOIN public.tbl_studiengangstyp 		stgtyp ON stgtyp.typ = stg.typ
+				JOIN public.tbl_organisationseinheit 	oe ON oe.oe_kurzbz = lv.oe_kurzbz
+		ORDER BY
+			oe.bezeichnung, lv.semester, lv.bezeichnung
+		';
+
+		return $this->execQuery($qry, $params);
+	}
+
 	/**
 	 * Gets unique Groupstrings for Lehrveranstaltungen, e.g. WS2018_BIF_1_PRJM_VZ_LV12345
 	 * @param string $studiensemester_kurzbz

application/models/education/Pruefung_model.php

@@ -175,6 +175,8 @@ class Pruefung_model extends DB_Model
 		$this->addSelect('campus.get_status_studierendenantrag(a.studierendenantrag_id) status');
 		$this->addSelect('pss.ausbildungssemester');
 
+		$this->addJoin('(SELECT MAX(datum) AS datum, lehreinheit_id AS le_id, student_uid AS stud_uid FROM lehre.tbl_pruefung p WHERE pruefungstyp_kurzbz IN (\'kommPruef\', \'zusKommPruef\') GROUP BY lehreinheit_id, student_uid) lpd',
+			'p.datum = lpd.datum AND p.lehreinheit_id = lpd.le_id AND p.student_uid = lpd.stud_uid');
 		$this->addJoin('lehre.tbl_lehreinheit le', 'lehreinheit_id');
 		$this->addJoin('lehre.tbl_lehrveranstaltung lv', 'lehrveranstaltung_id');
 		$this->addJoin('public.tbl_student s', 'student_uid');

application/models/education/Studierendenantrag_model.php

@@ -38,6 +38,7 @@ class Studierendenantrag_model extends DB_Model
 		$this->addSelect('studienjahr_kurzbz');
 		$this->addSelect('vorname');
 		$this->addSelect('nachname');
+		$this->addSelect('unruly');
 		$this->addSelect('p.prestudent_id');
 		$this->addSelect('p.studiengang_kz');
 		$this->addSelect('semester');
@@ -96,7 +97,8 @@ class Studierendenantrag_model extends DB_Model
 			Studierendenantragstatus_model::STATUS_REJECTED,
 			Studierendenantragstatus_model::STATUS_OBJECTION_DENIED,
 			Studierendenantragstatus_model::STATUS_DEREGISTERED,
-			Studierendenantragstatus_model::STATUS_PAUSE
+			Studierendenantragstatus_model::STATUS_PAUSE,
+			Studierendenantragstatus_model::STATUS_REMINDERSENT
 		]);
 		$this->db->or_group_start();
 		$this->db->where('s.studierendenantrag_statustyp_kurzbz', Studierendenantragstatus_model::STATUS_APPROVED);
@@ -148,6 +150,8 @@ class Studierendenantrag_model extends DB_Model
 		$this->addSelect('s.studierendenantrag_statustyp_kurzbz status');
 		$this->addSelect('s.insertvon status_insertvon');
 		$this->addSelect('t.bezeichnung[(' . $lang . ')] statustyp');
+		$this->addSelect('p.unruly AS unruly');
+		$this->addSelect($this->dbTable . '.insertamum AS insertamum');
 
 		$this->addJoin(
 			'campus.tbl_studierendenantrag_status s',
@@ -157,6 +161,18 @@ class Studierendenantrag_model extends DB_Model
 			'campus.tbl_studierendenantrag_statustyp t',
 			's.studierendenantrag_statustyp_kurzbz=t.studierendenantrag_statustyp_kurzbz'
 		);
+		$this->addJoin(
+			'public.tbl_student st',
+			'st.prestudent_id=tbl_studierendenantrag.prestudent_id'
+		);
+		$this->addJoin(
+			'public.tbl_benutzer b',
+			'st.student_uid=b.uid'
+		);
+		$this->addJoin(
+			'public.tbl_person p',
+			'b.person_id=p.person_id'
+		);
 
 		if ($types && is_array($types)) {
 			$this->db->where_in('typ', $types);
@@ -354,7 +370,7 @@ class Studierendenantrag_model extends DB_Model
 		$this->db->where([
 			'prestudent_id' => $prestudent_id,
 			'typ' => Studierendenantrag_model::TYP_UNTERBRECHUNG,
-			'campus.get_status_studierendenantrag(studierendenantrag_id) !=' => Studierendenantragstatus_model::STATUS_CANCELLED,
+			'campus.get_status_studierendenantrag(studierendenantrag_id) NOT IN (\'' . Studierendenantragstatus_model::STATUS_CANCELLED . '\', \'' . Studierendenantragstatus_model::STATUS_REJECTED . '\')' => null,
 			'start < ' . $end => null,
 			'datum_wiedereinstieg > ' . $start => null,
 		]);
@@ -410,7 +426,7 @@ class Studierendenantrag_model extends DB_Model
 			FROM campus.tbl_studierendenantrag 
 			LEFT JOIN public.tbl_studiensemester USING(studiensemester_kurzbz) 
 			WHERE typ=? 
-			AND campus.get_status_studierendenantrag(studierendenantrag_id) != ?
+			AND campus.get_status_studierendenantrag(studierendenantrag_id) NOT IN ?
 			AND prestudent_id=?
 		) a ON (s.start < a.ende AND s.ende > a.start)
 		WHERE s.start >= (" . $subquery . ")
@@ -420,7 +436,10 @@ class Studierendenantrag_model extends DB_Model
 		return $this->execQuery($sql, [
 			$max_length,
 			self::TYP_UNTERBRECHUNG,
-			Studierendenantragstatus_model::STATUS_CANCELLED,
+			array(
+			    Studierendenantragstatus_model::STATUS_CANCELLED,
+			    Studierendenantragstatus_model::STATUS_REJECTED
+			),
 			$prestudent_id,
 			$studiensemester ?: $prestudent_id,
 			$max_length * $max_starters

application/models/organisation/Studienjahr_model.php

@@ -29,4 +29,54 @@ class Studienjahr_model extends DB_Model
 
 		return $this->execQuery($query);
 	}
+
+	/**
+	 * Get the current Studienjahr. During the summer term, continue using the previous Studienjahr.
+	 *
+	 * @param int $days
+	 * @return array|stdClass|null
+	 */
+	public function getLastOrAktStudienjahr($days = 60)
+	{
+		if (!is_numeric($days))
+		{
+			$days = 60;
+		}
+
+		$query = '
+			SELECT *
+			FROM public.tbl_studienjahr
+			JOIN public.tbl_studiensemester USING (studienjahr_kurzbz)
+			WHERE start < NOW() - \'' . $days . ' DAYS\'::INTERVAL
+			ORDER by start DESC
+			LIMIT 1
+		';
+
+		return $this->execQuery($query);
+	}
+
+	/**
+	 * Get the current Studienjahr. During the summer term, get the upcoming next Studienjahr.
+	 *
+	 * @param int $days
+	 * @return array|stdClass|null
+	 */
+	public function getAktOrNextStudienjahr($days = 62)
+	{
+		if (!is_numeric($days))
+		{
+			$days = 62;
+		}
+
+		$query = '
+			SELECT *
+			FROM public.tbl_studienjahr
+			JOIN public.tbl_studiensemester using(studienjahr_kurzbz)
+			WHERE start < NOW() + \'' . $days . ' DAYS\'::INTERVAL
+			ORDER by start DESC
+			LIMIT 1
+		';
+
+		return $this->execQuery($query);
+	}
 }

application/models/person/Person_model.php

@@ -294,15 +294,15 @@ class Person_model extends DB_Model
 	{
 		$qry = "SELECT person_id
 				FROM public.tbl_prestudent p
-				JOIN 
+				JOIN
 				(
 					SELECT DISTINCT ON(prestudent_id) *
 					FROM public.tbl_prestudentstatus
-					WHERE prestudent_id IN 
+					WHERE prestudent_id IN
 						(
-							SELECT prestudent_id 
-							FROM public.tbl_prestudent 
-							WHERE person_id IN 
+							SELECT prestudent_id
+							FROM public.tbl_prestudent
+							WHERE person_id IN
 							(
 								SELECT p2.person_id
 								FROM public.tbl_person p
@@ -316,8 +316,8 @@ class Person_model extends DB_Model
 					ORDER BY prestudent_id, datum DESC, insertamum DESC
 				) ps USING(prestudent_id)
 				JOIN public.tbl_status USING(status_kurzbz)
-				WHERE status_kurzbz = 'Interessent' 
-				AND studiengang_kz IN 
+				WHERE status_kurzbz = 'Interessent'
+				AND studiengang_kz IN
 				(
 					SELECT studiengang_kz
 					FROM public.tbl_prestudent p
@@ -374,5 +374,38 @@ class Person_model extends DB_Model
 			'prestudent_id' => $prestudent_id
 		]);
 	}
-}
 
+	public function checkUnruly($vorname, $nachname, $gebdatum)
+	{
+		$qry = "SELECT person_id, vorname, nachname, gebdatum, unruly
+				FROM tbl_person
+				WHERE tbl_person.vorname = ? 
+					AND tbl_person.nachname = ? 
+					AND tbl_person.gebdatum = ? 
+					AND tbl_person.unruly = TRUE;";
+
+		return $this->execQuery($qry, [$vorname, $nachname, $gebdatum]);
+	}
+
+	public function checkUnrulyWhere($where, $paramsArray)
+	{
+		$qry =  'SELECT *
+				FROM tbl_person p
+				WHERE '.$where.';';
+
+		return $this->execQuery($qry, $paramsArray);
+	}
+
+	public function updateUnruly($person_id, $unruly)
+	{
+		$result = $this->update($person_id, array(
+			'unruly' => $unruly
+		));
+
+		if (isError($result)) {
+			return error($result->msg, EXIT_ERROR);
+		} else if (isSuccess($result) && hasData($result)) {
+			return success($result);
+		}
+	}
+}

application/views/lehre/Antrag/Create.php

@@ -52,4 +52,4 @@ $this->load->view(
 $this->load->view(
 	'templates/FHC-Footer',
 	$sitesettings
-);
+);

application/views/lehre/lvplanung/lvTemplateUebersicht.php

@@ -0,0 +1,29 @@
+<?php
+$includesArray = array(
+	'title' => 'LV Template Übersicht',
+	'vue3' => true,
+	'axios027' => true,
+	'bootstrap5' => true,
+	'tabulator5' => true,
+	'fontawesome6' => true,
+	'primevue3' => true,
+	'navigationcomponent' => true,
+	'filtercomponent' => true,
+	'customJSModules' => array('public/js/apps/lehre/lvplanung/LvTemplates.js'),
+	'customCSSs' => array(
+	    'public/css/Fhc.css',
+	    'public/css/lvTemplateUebersicht.css'
+	)
+);
+
+$this->load->view('templates/FHC-Header', $includesArray);
+?>
+
+<div id="main">
+    <!-- Navigation component -->
+    <core-navigation-cmpt></core-navigation-cmpt>
+
+    <lv-template-uebersicht></lv-template-uebersicht>
+</div>
+
+<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>

application/views/system/infocenter/infocenterDetails.php

@@ -27,7 +27,8 @@
 			'public/js/infocenter/rueckstellung.js',
 			'public/js/infocenter/zgvUeberpruefung.js',
 			'public/js/infocenter/docUeberpruefung.js',
-			'public/js/infocenter/stammdaten.js'
+			'public/js/infocenter/stammdaten.js',
+			'public/js/infocenter/personcheck.js'
 		),
 		'phrases' => array(
 			'infocenter',
@@ -38,6 +39,14 @@
 
 	$this->load->view('templates/FHC-Header', $includesArray);
 ?>
+
+	<script>
+		// Embed PHP data into JS as JSON to access from script files
+		const viewData = {
+			checkPerson: <?php echo json_encode(array('unruly' => $unruly, 'duplicate' => $duplicate)); ?>,
+		};
+	</script>
+
 	<div id="wrapper">
 	
 		<?php echo $this->widgetlib->widget('NavigationWidget'); ?>
@@ -74,22 +83,8 @@
 						</div>
 					</div>
 				</div>
-				<?php if (!is_null($duplicated)): ?>
-					<div class="row alert-warning">
-						<h3 class="header col-lg-12">
-							<?php echo $this->p->t('global', 'bewerberVorhanden') . ':'; ?>
-						</h3>
-						<div class="text-left col-lg-12">
-							<?php
-							foreach ($duplicated as $duplicate)
-							{
-								echo  'Person ID: ' . $duplicate->person_id . '<br />';
-							}
-							?>
-						</div>
-	
-					</div>
-				<?php endif; ?>
+				<br/>
+					<?php $this->load->view('system/infocenter/personCheck.php', array('unruly' => $unruly, 'duplicate' => $duplicate)); ?>
 				<br/>
 				<section>
 					<div class="row">
@@ -201,5 +196,4 @@
 	</div> <!-- ./wrapper -->
 	<button id="scrollToTop" title="Go to top"><i class="fa fa-chevron-up"></i></button>
 
-<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
-
+<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>

application/views/system/infocenter/personCheck.php

@@ -0,0 +1,34 @@
+
+<div class="row alert-info" id="unruly" style="display: none;">
+	<h3 class="header col-lg-12">
+		<?php echo $this->p->t('infocenter', 'unrulyPersonFound') . ':'; ?>
+	</h3>
+	<div class="text-left col-lg-12" id="unrulylist">
+		<?php
+		if($unruly) {
+			foreach ($unruly as $unruled)
+			{
+				echo '<p>Person ID: ' . $unruled->person_id . '<p/>';
+			}
+		}
+		?>
+	</div>
+</div>
+
+<div class="row alert-warning" id="duplicate" style="display: none;">
+
+	<h3 class="header col-lg-12">
+		<?php echo $this->p->t('global', 'bewerberVorhanden') . ':'; ?>
+	</h3>
+	<div class="text-left col-lg-12" id="duplicatelist">
+		<?php
+		if($duplicate) {
+			foreach ($duplicate as $dupe)
+			{
+				echo '<p>Person ID: ' . $dupe->person_id . '<p/>';
+			}
+		}
+		?>
+	</div>
+
+</div>

config/vilesci.config-default.inc.php

@@ -266,6 +266,8 @@ define('BIS_FUNKTIONSCODE_6_ARR', array(
 
 // bPk Abfrage
 define('BPK_FUER_ALLE_BENUTZER_ABFRAGEN', false);
+// bPk Typen in Form 'BEREICH' => 'kennzeichenTyp'
+define('VBPK_TYPES', array('AS' => 'vbpkAs', 'BF' => 'vbpkBf', 'ZP-TD' => 'vbpkTd'));
 
 // Docsbox configs
 define('DOCSBOX_SERVER', 'http://docconverter.technikum-wien.at/');

include/dvb.class.php

@@ -29,6 +29,7 @@ require_once(dirname(__FILE__).'/studiensemester.class.php');
 require_once(dirname(__FILE__).'/adresse.class.php');
 require_once(dirname(__FILE__).'/webservicelog.class.php');
 require_once(dirname(__FILE__).'/prestudent.class.php');
+require_once(dirname(__FILE__).'/kennzeichen.class.php');
 require_once(dirname(__FILE__).'/errorhandler.class.php');
 
 class dvb extends basis_db
@@ -42,6 +43,7 @@ class dvb extends basis_db
 	const DVB_URL_WEBSERVICE_RESERVIERUNG = DVB_PORTAL.'/rws/0.6/matrikelreservierung.xml';
 	const DVB_URL_WEBSERVICE_MELDUNG = DVB_PORTAL.'/rws/0.6/matrikelmeldung.xml';
 	const DVB_URL_WEBSERVICE_BPK = DVB_PORTAL.'/rws/0.6/pruefebpk.xml';
+	const DVB_URL_WEBSERVICE_BPK_ALL = DVB_PORTAL.'/rws/0.8/pruefebpk.xml';
 
 	public $authentication;
 	private $username;
@@ -1149,15 +1151,29 @@ class dvb extends basis_db
 	 */
 	public function getBPK($person_id)
 	{
+		$vbpkTypes = defined('VBPK_TYPES') && is_array(VBPK_TYPES) ? VBPK_TYPES : null;
+
 		$person = new person();
 		if ($person->load($person_id))
 		{
 			if ($person->bpk != '')
 			{
-				// BPK exisitert bereits
 				$retval = new stdClass();
 				$retval->bpk = $person->bpk;
-				return ErrorHandler::success($retval);
+
+				// BPK existiert bereits
+				if (!isset($vbpkTypes)) return ErrorHandler::success($retval);
+
+				$kennzeichen = new kennzeichen();
+
+				if ($kennzeichen->load_pers($person_id, $vbpkTypes))
+				{
+					if (array_unique(array_column($kennzeichen->result, 'kennzeichentyp_kurzbz')) == array_values($vbpkTypes))
+					{
+						// BPKs exisiteren bereits
+						return ErrorHandler::success($retval);
+					}
+				}
 			}
 
 			if ($person->gebdatum == '')
@@ -1178,7 +1194,8 @@ class dvb extends basis_db
 				return ErrorHandler::error($errormsg);
 			}
 
-			$geburtsdatum = str_replace("-", "", $person->gebdatum);
+			//$geburtsdatum = str_replace("-", "", $person->gebdatum);
+			$geburtsdatum = $person->gebdatum;
 			$vorname = $person->vorname;
 			$nachname = $person->nachname;
 			$geschlecht = mb_strtoupper($person->geschlecht);
@@ -1258,6 +1275,8 @@ class dvb extends basis_db
 	 */
 	public function pruefeBPK($geburtsdatum, $vorname, $nachname, $geschlecht, $plz = null, $strasse = null)
 	{
+		$vbpkTypes = defined('VBPK_TYPES') && is_array(VBPK_TYPES) ? VBPK_TYPES : null;
+
 		if ($this->tokenIsExpired())
 		{
 			$result = $this->authenticate();
@@ -1271,7 +1290,7 @@ class dvb extends basis_db
 
 		$uuid = $this->getUUID();
 
-		$url = self::DVB_URL_WEBSERVICE_BPK;
+		$url = self::DVB_URL_WEBSERVICE_BPK_ALL;
 		$url .= '?geburtsdatum='.curl_escape($curl, $geburtsdatum);
 		$url .= '&vorname='.curl_escape($curl, $vorname);
 		$url .= '&nachname='.curl_escape($curl, $nachname);
@@ -1311,24 +1330,15 @@ class dvb extends basis_db
 		if ($curl_info['http_code'] == '200')
 		{
 			/* Example Response:
-			 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-			 <simpleBpkResponse xmlns="http://www.brz.gv.at/datenverbund-unis">
-			 	<bpk>12345ABCDEFGHXXXXXXX=</bpk>
-				<personInfo>
-				<person>
-					<vorname>Hans</vorname>
-					<nachname>Huber</nachname>
-					<geschlecht>M</geschlecht>
-					<gebdat>1990-01-01</gebdat>
-				</person>
-				<adresse>
-					<staat></staat>
-					<plz>1100</plz>
-					<ort></ort>
-					<strasse></strasse>
-				</adresse>
-				</personInfo>
-			</simpleBpkResponse>
+			<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+				<bpkResponse xmlns="http://www.brz.gv.at/datenverbund-unis">
+					<uuid>5cc93441-a46a-4f97-a5e3-e64891b39f10</uuid>
+					<bpk>12345ABCDEFG</bpk>
+					<vbpk bereich="AS" vkz="BBA-STA">12345ABCDEFG</vbpk>
+					<vbpk bereich="BF" vkz="BMBWF">12345ABCDEFG</vbpk>
+					<vbpk bereich="ZP-TD" vkz="BMF">12345ABCDEFG</vbpk>
+					<geprueft>true</geprueft>
+				</bpkResponse>
 
 			Example Error:
 			<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
@@ -1369,10 +1379,30 @@ class dvb extends basis_db
 			}
 
 			$domnodes_bpk = $dom->getElementsByTagNameNS($namespace, 'bpk');
+
 			if ($domnodes_bpk->length > 0)
 			{
 				$retval = new stdClass();
 				$retval->bpk = $domnodes_bpk->item(0)->textContent;
+
+				// vbpks auslesen
+				$domnodes_vbpks = $dom->getElementsByTagNameNS($namespace, 'vbpk');
+
+				$retval->vbpks = array();
+				if ($domnodes_vbpks->length > 0)
+				{
+					foreach ($domnodes_vbpks as $domnode_vbpk)
+					{
+						foreach ($domnode_vbpk->attributes as $attribute)
+						{
+							if ($attribute->nodeName == 'bereich' && isset($vbpkTypes[$attribute->nodeValue]))
+							{
+								$retval->vbpks[$vbpkTypes[$attribute->nodeValue]] = $domnode_vbpk->nodeValue;
+							}
+						}
+					}
+				}
+
 				return ErrorHandler::success($retval);
 			}
 			else
@@ -1385,6 +1415,27 @@ class dvb extends basis_db
 					$retval->multiple = true;
 					return ErrorHandler::error(null, $retval);
 				}
+				else
+				{
+					$errorTexts = array();
+					$domnodes_fehler = $dom->getElementsByTagNameNS($namespace, 'fehlerliste');
+
+					if ($domnodes_fehler->length > 0)
+					{
+						foreach ($domnodes_fehler as $domnode_fehler)
+						{
+							if ($domnode_fehler->childNodes->length > 0)
+							{
+								foreach ($domnode_fehler->childNodes as $childNode)
+								{
+									$errorTexts[] = $childNode->nodeValue;
+								}
+							}
+						}
+						$this->errormsg = count($errorTexts) > 0 ? implode('; ', $errorTexts) : null;
+						return ErrorHandler::error(null);
+					}
+				}
 			}
 			return ErrorHandler::error();
 		}

include/kennzeichen.class.php

@@ -0,0 +1,261 @@
+<?php
+/* Copyright (C) 2006 Technikum-Wien
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors: Alexei Karpenko <karpenko@technikum-wien.at>,
+ */
+/**
+ * Klasse kennzeichen
+ */
+require_once(dirname(__FILE__).'/basis_db.class.php');
+
+class kennzeichen extends basis_db
+{
+	public $new;       // boolean
+	public $result = array(); // adresse Objekt
+
+	//Tabellenspalten
+	public $kennzeichen_id;	// integer
+	public $person_id;	// integer
+
+	public $kennzeichentyp_kurzbz;	// string
+	public $inhalt;	// string
+	public $aktiv;	// boolean
+	public $insertamum;	// timestamp
+	public $insertvon;	// string
+	public $updateamum;	// timestamp
+	public $updatevon;	// string
+
+	/**
+	 * Konstruktor
+	 * @param $kennzeichen_id ID des Kennzeichens das geladen werden soll (Default=null)
+	 */
+	public function __construct($kennzeichen_id=null)
+	{
+		parent::__construct();
+		$this->new = true;
+
+		if(!is_null($kennzeichen_id))
+			$this->load($kennzeichen_id);
+	}
+
+	/**
+	 * Laedt ein Kennzeichen mit der ID $kennzeichen_id
+	 * @param  $kennzeichen_id ID des zu ladenden Kennzeichens
+	 * @return true wenn ok, false im Fehlerfall
+	 */
+	public function load($kennzeichen_id)
+	{
+		if (!is_numeric($kennzeichen_id))
+		{
+			$this->errormsg = 'Kennzeichen Id ist ungueltig';
+			return false;
+		}
+
+		$qry = "SELECT
+					*
+				FROM
+					public.tbl_kennzeichen
+				WHERE
+					kennzeichen_id = " . $this->db_add_param($kennzeichen_id, FHC_INTEGER) . ";";
+
+		if ($this->db_query($qry))
+		{
+			if ($row = $this->db_fetch_object())
+			{
+				$this->kennzeichen_id = $row->kennzeichen_id;
+				$this->person_id = $row->person_id;
+				$this->kennzeichentyp_kurzbz = $row->kennzeichentyp_kurzbz;
+				$this->inhalt = $row->inhalt;
+				$this->aktiv = $this->db_parse_bool($row->aktiv);
+				$this->updateamum = $row->updateamum;
+				$this->updatevon = $row->updatevon;
+				$this->insertamum = $row->insertamum;
+				$this->insertvon = $row->insertvon;
+				return true;
+			}
+			else
+			{
+				$this->errormsg = 'Datensatz wurde nicht gefunden';
+				return false;
+			}
+		}
+		else
+		{
+			$this->errormsg = 'Fehler beim Laden der Daten';
+			return false;
+		}
+	}
+
+	/**
+	 * Prueft die Kennzeichen auf Gueltigkeit
+	 * @return true wenn ok, false im Fehlerfall
+	 */
+	public function validate()
+	{
+		//Gesamtlaenge pruefen
+		if(mb_strlen($this->kennzeichentyp_kurzbz)>32)
+		{
+			$this->errormsg = 'Kennzeichentyp darf nicht länger als 32 Zeichen sein';
+			return false;
+		}
+		$this->errormsg = '';
+		return true;
+	}
+
+	/**
+	 * Speichert den aktuellen Datensatz in die Datenbank
+	 * Wenn $neu auf true gesetzt ist wird ein neuer Datensatz angelegt
+	 * andernfalls wird der Datensatz mit der ID in $kennzeichen_id aktualisiert
+	 * @return true wenn ok, false im Fehlerfall
+	 */
+	public function save($new = null)
+	{
+		if(!is_null($new))
+			$this->new = $new;
+
+		//Variablen pruefen
+		if(!$this->validate())
+			return false;
+
+		if($this->new)
+		{
+			//Neuen Datensatz einfuegen
+			$qry='BEGIN;INSERT INTO public.tbl_kennzeichen (person_id, kennzeichentyp_kurzbz, inhalt, aktiv, insertamum, insertvon) VALUES('.
+				$this->db_add_param($this->person_id, FHC_INTEGER).', '.
+				$this->db_add_param($this->kennzeichentyp_kurzbz).', '.
+				$this->db_add_param($this->inhalt).', '.
+				$this->db_add_param($this->aktiv, FHC_BOOLEAN).', now(), '.
+				$this->db_add_param($this->insertvon).');';
+		}
+		else
+		{
+			//Updaten des bestehenden Datensatzes
+
+			//Pruefen ob kennzeichen_id eine gueltige Zahl ist
+			if(!is_numeric($this->kennzeichen_id))
+			{
+				$this->errormsg = 'kennzeichen_id muss eine gueltige Zahl sein';
+				return false;
+			}
+
+			$qry='UPDATE public.tbl_kennzeichen SET '.
+				'person_id='.$this->db_add_param($this->person_id,FHC_INTEGER).', '.
+				'kennzeichentyp_kurzbz='.$this->db_add_param($this->kennzeichentyp_kurzbz).', '.
+				'aktiv='.$this->db_add_param($this->aktiv, FHC_BOOLEAN).', '.
+				'updateamum= now(), '.
+				'updatevon='.$this->db_add_param($this->updatevon).' '.
+				'WHERE kennzeichen_id='.$this->db_add_param($this->kennzeichen_id, FHC_INTEGER).';';
+		}
+
+		if($this->db_query($qry))
+		{
+			//Sequence auslesen um die eingefuegte ID zu ermitteln
+			if($this->new)
+			{
+				$qry = "SELECT currval('public.tbl_kennzeichen_id_seq') as id;";
+
+				if($this->db_query($qry))
+				{
+					if($row = $this->db_fetch_object())
+					{
+						$this->kennzeichen_id = $row->id;
+						$this->db_query('COMMIT;');
+						return true;
+					}
+					else
+					{
+						$this->errormsg = 'Fehler beim Auslesen er Sequence';
+						$this->db_query('ROLLBACK;');
+						return false;
+					}
+				}
+				else
+				{
+					$this->errormsg = 'Fehler beim Auslesen der Sequence';
+					$this->db_query('ROLLBACK;');
+					return false;
+				}
+			}
+			return true;
+		}
+		else
+		{
+			$this->errormsg = 'Fehler beim Speichern der Daten';
+			return false;
+		}
+	}
+
+	/**
+	 * Laedt Kennzeichen einer Person
+	 * @param person_id
+	 * @param kennzeichentyp_kurzbz_arr filtern nach Kennzeichentyp
+	 * @return boolean
+	 */
+	public function load_pers($person_id, $kennzeichentyp_kurzbz_arr)
+	{
+		if(!is_numeric($person_id))
+		{
+			$this->errormsg = 'Person_id ist ungueltig';
+			return false;
+		}
+		if(!is_array($kennzeichentyp_kurzbz_arr))
+		{
+			$this->errormsg = 'Kennzeichen sind ungueltig';
+			return false;
+		}
+
+		$qry = "
+			SELECT
+				kz.kennzeichen_id, kz.person_id, kz.kennzeichentyp_kurzbz, inhalt, aktiv, updateamum, updatevon, insertamum, insertvon
+			FROM
+				public.tbl_kennzeichen kz
+			WHERE
+				person_id=".$this->db_add_param($person_id, FHC_INTEGER)."
+				AND aktiv = TRUE
+				AND kennzeichentyp_kurzbz IN (".$this->implode4SQL($kennzeichentyp_kurzbz_arr).")
+			ORDER BY
+				kz.kennzeichentyp_kurzbz, kz.kennzeichen_id;";
+
+		if($this->db_query($qry))
+		{
+			while($row = $this->db_fetch_object())
+			{
+				$obj = new kennzeichen();
+
+				$obj->kennzeichen_id = $row->kennzeichen_id;
+				$obj->person_id = $row->person_id;
+				$obj->kennzeichentyp_kurzbz = $row->kennzeichentyp_kurzbz;
+				$obj->inhalt = $row->inhalt;
+				$obj->aktiv = $this->db_parse_bool($row->aktiv);
+				$obj->updateamum = $row->updateamum;
+				$obj->updatevon = $row->updatevon;
+				$obj->insertamum = $row->insertamum;
+				$obj->insertvon = $row->insertvon;
+
+				$this->result[] = $obj;
+			}
+
+			return true;
+		}
+		else
+		{
+			$this->errormsg = 'Fehler beim Laden der Daten';
+			return false;
+		}
+	}
+}
+?>

include/person.class.php

@@ -98,9 +98,9 @@ class person extends basis_db
 							geschlecht, staatsbuergerschaft, geburtsnation, kurzbeschreibung, zugangscode, foto_sperre,
 							matr_nr, bpk, wahlname";
 			if ($hasUDF = $udf->personHasUDF())
-				$qry .= ", udf_values ";
+				$qry .= ", udf_values";
 
-			$qry .= "FROM public.tbl_person
+			$qry .= " FROM public.tbl_person
 					 WHERE person_id = " . $this->db_add_param($personId, FHC_INTEGER);
 
 			if (!$this->db_query($qry))

include/tw/vilesci_menu_main.inc.php

@@ -70,6 +70,7 @@ $menu=array
 		'link'=>'left.php?categorie=Lehre', 'target'=>'nav',
 		'Gruppenverwaltung'=>array('name'=>'Gruppen', 'permissions'=>array('admin','lv-plan','support','lehre/gruppe'), 'link'=>'stammdaten/lvbgruppenverwaltung.php', 'target'=>'main'),
 		'Lehrveranstaltung'=>array('name'=>'Lehrveranstaltung', 'link'=>'lehre/lehrveranstaltung_frameset.html', 'target'=>'main'),
+		'lvTemplateUebersicht'=>array('name'=>'LV-Template Übersicht', 'link'=>'../index.ci.php/lehre/lvplanung/LvTemplateUebersicht', 'target'=>'_blank'),
 		'Studienordnung'=>array('name'=>'Studienordnung', 'link'=>'lehre/studienordnung.php', 'target'=>'_blank','permissions'=>array('lehre/studienordnung')),
 		'StudienplanGueltigkeit'=>array('name'=>'Studienplan Gültigkeit', 'link'=>'lehre/studienplan_gueltigkeit.php', 'target'=>'main','permissions'=>array('lehre/studienordnung')),
 		'StudienplanVorruecken'=>array('name'=>'Studienplan vorrücken', 'link'=>'lehre/studienplan_vorrueckung.php', 'target'=>'main','permissions'=>array('lehre/studienplan')),

public/css/lvTemplateUebersicht.css

@@ -0,0 +1,3 @@
+html {
+    font-size: .75em;
+}

public/js/api/checkperson.js

@@ -0,0 +1,23 @@
+export default {
+	updatePersonUnrulyStatus(person_id, unrulyParam) {
+
+		try {
+			const payload = {person_id, unruly: unrulyParam}
+			const url = '/api/frontend/v1/checkperson/CheckPerson/updatePersonUnrulyStatus';
+			return this.$fhcApi.post(url, payload, null);
+		} catch (error) {
+			throw error;
+		}
+
+	},
+	filterPerson(payload, base = ''){
+
+		try {
+			const url = base + '/api/frontend/v1/checkperson/CheckPerson/filterPerson';
+			return axios.post(url, payload)
+		} catch (error) {
+			throw error;
+		}
+
+	}
+}

public/js/api/fhcapifactory.js

@@ -23,6 +23,7 @@ import studstatus from "./studstatus.js";
 import stv from "./stv.js";
 import notiz from "./notiz.js";
 import betriebsmittel from "./betriebsmittel.js";
+import checkperson from "./checkperson.js";
 
 export default {
     search,
@@ -32,5 +33,6 @@ export default {
     studstatus,
     stv,
     notiz,
-    betriebsmittel
-};
+    betriebsmittel,
+    checkperson
+};

public/js/apps/Bismeldestichtag/Bismeldestichtag.js

@@ -15,8 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import {BismeldestichtagTabulatorOptions} from './TabulatorSetup.js';
-import {BismeldestichtagTabulatorEventHandlers} from './TabulatorSetup.js';
+import {BismeldestichtagHelper} from './BismeldestichtagHelper.js';
 
 import {CoreFilterCmpt} from '../../components/filter/Filter.js';
 import {CoreNavigationCmpt} from '../../components/navigation/Navigation.js';
@@ -29,8 +28,60 @@ import Phrasen from '../../plugin/Phrasen.js';
 const bismeldestichtagApp = Vue.createApp({
 	data: function() {
 		return {
-			bismeldestichtagTabulatorOptions: BismeldestichtagTabulatorOptions,
-			bismeldestichtagTabulatorEventHandlers: BismeldestichtagTabulatorEventHandlers,
+			bismeldestichtagTabulatorOptions: {
+				maxHeight: "100%",
+				minHeight: 50,
+				layout: 'fitColumns',
+				index: 'meldestichtag_id',
+				initialSort:[
+					{column:"meldestichtag", dir:"desc"}
+				],
+				columns: [
+					{title: 'Meldestichtag', field: 'meldestichtag', headerFilter: true, formatter: function(cell){
+							return BismeldestichtagHelper.formatDate(cell.getValue());
+						}
+					},
+					{title: 'Studiensemester', field: 'studiensemester_kurzbz', headerFilter: true, sorter:function(a, b, aRow, bRow, column, dir, sorterParams) {
+
+							//aRow, bRow - the row components for the values being compared
+							let semesterStartA = new Date(aRow.getData().semester_start);
+							let semesterStartB = new Date(bRow.getData().semester_start);
+
+							return semesterStartA - semesterStartB; // difference between studiensemester start dates
+						}
+					},
+					{title: 'Semesterstart',field: 'semester_start', headerFilter: true, visible: false, formatter: function(cell){
+							return BismeldestichtagHelper.formatDate(cell.getValue());
+						}
+					},
+					{title: 'ID', field: 'meldestichtag_id', headerFilter: true, visible: false},
+					{title: 'Insertamum', field: 'insertamum', headerFilter: true, visible: false},
+					{title: 'Insertvon', field: 'insertvon', headerFilter: true, visible: false},
+					{title: 'Löschen', field: 'loeschen', headerFilter: false, formatter:function(cell){
+							return	'<button class="btn btn-outline-secondary delete-btn" data-meldestichtag-id="'+cell.getRow().getIndex()+'">'+
+										'<i class="fa fa-xmark"></i>'+
+									'</button>';
+						}
+					}
+				]
+			},
+			bismeldestichtagTabulatorEventHandlers: [
+				{
+					event: "rowClick",
+					handler: function(e, row) {
+						if (e.target.nodeName == 'DIV') {
+							let data = row.getData();
+							alert(data.studiensemester_kurzbz + ': ' + BismeldestichtagHelper.formatDate(data.meldestichtag));
+						}
+					}
+				},
+				{
+					event: "tableBuilt",
+					handler: () => {
+						this.handlerStudiensemester();
+					}
+				}
+			],
 			meldestichtag: null, // date of Meldestichtag
 			semList: null, // all Studiensemester for dropdown
 			currSem: null, // selected Studiensemester
@@ -47,9 +98,6 @@ const bismeldestichtagApp = Vue.createApp({
 		CoreFetchCmpt,
 		"datepicker": VueDatePicker
 	},
-	created() {
-		this.handlerStudiensemester();
-	},
 	methods: {
 		/**
 		 * Define Studiensemester call and method to be executed after the call

public/js/apps/Bismeldestichtag/BismeldestichtagHelper.js

@@ -0,0 +1,22 @@
+/**
+ * Copyright (C) 2022 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+export const BismeldestichtagHelper = {
+	formatDate: function(date) {
+		return date.replace(/(.*)-(.*)-(.*)/, '$3.$2.$1');
+	}
+}

public/js/apps/Bismeldestichtag/TabulatorSetup.js

@@ -1,75 +0,0 @@
-/**
- * Copyright (C) 2022 fhcomplete.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-/**
- *
- */
-export const BismeldestichtagTabulatorOptions = {
-	maxHeight: "100%",
-	minHeight: 50,
-	layout: 'fitColumns',
-	index: 'meldestichtag_id',
-	columns: [
-		{title: 'Meldestichtag',field: 'meldestichtag', headerFilter: true, formatter: function(cell){
-				return BismeldestichtagTabulatorHelperFunctions._formatDate(cell.getValue());
-			}
-		},
-		{title: 'Studiensemester', field: 'studiensemester_kurzbz', headerFilter: true, sorter:function(a, b, aRow, bRow, column, dir, sorterParams) {
-
-				//aRow, bRow - the row components for the values being compared
-				let semesterStartA = new Date(aRow.getData().semester_start);
-				let semesterStartB = new Date(bRow.getData().semester_start);
-
-				return semesterStartA - semesterStartB; // difference between studiensemester start dates
-			}
-		},
-		{title: 'Semesterstart',field: 'semester_start', headerFilter: true, visible: false, formatter: function(cell){
-				return BismeldestichtagTabulatorHelperFunctions._formatDate(cell.getValue());
-			}
-		},
-		{title: 'ID', field: 'meldestichtag_id', headerFilter: true, visible: false},
-		{title: 'Insertamum', field: 'insertamum', headerFilter: true, visible: false},
-		{title: 'Insertvon', field: 'insertvon', headerFilter: true, visible: false},
-		{title: 'Löschen', field: 'loeschen', headerFilter: false, formatter:function(cell){
-				return	'<button class="btn btn-outline-secondary delete-btn" data-meldestichtag-id="'+cell.getRow().getIndex()+'">'+
-							'<i class="fa fa-xmark"></i>'+
-						'</button>';
-			}
-		}
-	]
-};
-
-/**
- *
- */
-export const BismeldestichtagTabulatorEventHandlers = [
-	{
-		event: "rowClick",
-		handler: function(e, row) {
-			if (e.target.nodeName == 'DIV') {
-				let data = row.getData();
-				alert(data.studiensemester_kurzbz + ': ' + BismeldestichtagTabulatorHelperFunctions._formatDate(data.meldestichtag));
-			}
-		}
-	}
-];
-
-let BismeldestichtagTabulatorHelperFunctions = {
-	_formatDate: function(date) {
-		return date.replace(/(.*)-(.*)-(.*)/, '$3.$2.$1');
-	}
-}

public/js/apps/lehre/lvplanung/LvTemplates.js

@@ -0,0 +1,37 @@
+/**
+ * Copyright (C) 2023 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+import LvTemplateUebersicht from '../../../lehre/lvplanung/LvTemplateUebersicht.js';
+import {CoreNavigationCmpt} from '../../../components/navigation/Navigation.js';
+import FhcAlert from '../../../plugin/FhcAlert.js';
+import FhcApi from "../../../plugin/FhcApi.js";
+import Phrasen from "../../../plugin/Phrasen.js";
+
+
+const lvTemplatesApp = Vue.createApp({
+	components: {
+		CoreNavigationCmpt,
+		LvTemplateUebersicht
+	}
+});
+
+lvTemplatesApp
+	.use(primevue.config.default,{zIndex: {overlay: 9999}})
+	.use(FhcAlert)
+	.use(FhcApi)
+	.use(Phrasen)
+	.mount('#main')

public/js/components/Studierendenantrag/Antrag.js

@@ -55,4 +55,4 @@ export default {
 		</component>
 	</div>
 	`
-}
+}

public/js/components/Studierendenantrag/Form/Abmeldung.js

@@ -77,6 +77,7 @@ export default {
 					this.formData.grund
 				)
 				.then(result => {
+
 					if (result.data === true)
 						document.location += "";
 
@@ -259,4 +260,4 @@ export default {
 			</template>
 		</core-fetch-cmpt>
 	</div>`
-}
+}

public/js/components/Studierendenantrag/Form/AbmeldungStgl.js

@@ -26,7 +26,8 @@ export default {
 			saving: false,
 			formData: {
 				grund: ''
-			}
+			},
+			unrulyInternal: false
 		}
 	},
 	computed: {
@@ -77,6 +78,16 @@ export default {
 					this.formData.grund
 				)
 				.then(result => {
+
+					if(this.unrulyInternal) {
+						this.$fhcApi.factory.checkperson.updatePersonUnrulyStatus(this.data.person_id, true).then(
+							(res)=> {
+								if(res?.meta?.status === "success") {
+									this.$fhcAlert.alertSuccess(this.$p.t('studierendenantrag', 'antrag_unruly_updated'))
+								}
+							})
+					}
+
 					if (result.data === true)
 						document.location += "";
 					
@@ -106,11 +117,16 @@ export default {
 			this.formData.grund = event.target.value
 				? this.$p.t('studierendenantrag', event.target.value)
 				: '';
-		},
+		}
 	},
 	created() {
 		this.uuid = _uuid++;
 	},
+	watch: {
+		'formData.grund'(newVal) {
+			this.unrulyInternal = (newVal === this.$p.t('studierendenantrag', 'textLong_unruly'))
+		}
+	},
 	template: `
 	<div class="studierendenantrag-form-abmeldung">
 		<core-fetch-cmpt :api-function="load">
@@ -172,7 +188,11 @@ export default {
 							<option value="textLong_plageat">{{$p.t('studierendenantrag', 'dropdown_plageat')}}
 							</option>					
 							<option value="textLong_MissingZgv">{{$p.t('studierendenantrag', 'dropdown_MissingZgv')}}
-							</option>						
+							</option>	
+<!--
+							<option value="textLong_unruly">{{$p.t('studierendenantrag', 'dropdown_unruly')}}
+							</option>
+-->
 						</select>	
 					</div>
 					<form-input

public/js/components/Studierendenantrag/Leitung/Table.js

@@ -485,4 +485,4 @@ export default {
 		</lv-popup>
 	</div>
 	`
-}
+}

public/js/infocenter/infocenterDetails.js

@@ -847,4 +847,4 @@ var InfocenterDetails = {
 	{
 		return elementid.substr(elementid.indexOf("_") + 1);
 	}
-};
+};

public/js/infocenter/personcheck.js

@@ -0,0 +1,70 @@
+$(document).ready(function ()
+{
+	if(viewData?.checkPerson?.unruly?.length) {
+		const unruly = document.getElementById('unruly')
+		unruly.setAttribute('style', 'display: block;')
+	}
+
+	if(viewData?.checkPerson?.duplicate?.length) {
+		const duplicate = document.getElementById('duplicate')
+		duplicate.setAttribute('style', 'display: block;')
+	}
+
+});
+
+var PersonCheck = {
+	update: function(data)
+	{
+		// format date according to db
+		if(data.gebdatum) {
+			const [day, month, year] = data.gebdatum.split('.');
+			data.gebdatum = year + '-' + month + '-' + day
+		}
+
+		FHC_AjaxClient.ajaxCallPost(
+			'api/frontend/v1/checkperson/CheckPerson/checkUnruly',
+			data,
+			{
+				successCallback: function(response, textStatus, jqXHR) {
+					if (response?.meta?.status === 'success')
+					{
+						PersonCheck._updatedUnruly(response);
+					}
+					else
+					{
+						FHC_DialogLib.alertError('unruly error');
+					}
+				},
+				errorCallback: function() {
+					FHC_DialogLib.alertWarning("Fehler beim Speichern!");
+				}
+			}
+		);
+
+	},
+
+	_updatedUnruly: function(response)
+	{
+		const unruly = document.getElementById('unruly')
+
+		if(response?.data?.retval?.length) {
+			viewData.checkPerson.unruly = response?.data?.retval
+
+			// replace existing elements
+			const unrulylist = document.getElementById('unrulylist')
+			const newUnrulyPeople = []
+			viewData.checkPerson.unruly.forEach(u => {
+				newUnrulyPeople.push(document.createTextNode("Person ID: " + u.person_id))
+				newUnrulyPeople.push(document.createElement('br'))
+			})
+			unrulylist.replaceChildren(...newUnrulyPeople)
+
+			// and show it all
+			unruly.setAttribute('style', 'display: block;')
+		} else {
+			// just hide everything
+			unruly.setAttribute('style', 'display: none;')
+		}
+
+	},
+}

public/js/infocenter/stammdaten.js

@@ -14,6 +14,7 @@ $(document).ready(function ()
 
 	$('.saveStammdaten').click(function()
 	{
+
 		var kontakt = [];
 		$('.kontakt_input').each(function(){
 			kontakt.push({
@@ -62,15 +63,16 @@ var Stammdaten = {
 			CALLED_PATH + "/updateStammdaten/",
 			data,
 			{
-				successCallback: function(data, textStatus, jqXHR) {
-					if (FHC_AjaxClient.isSuccess(data))
+				successCallback: function(response, textStatus, jqXHR) {
+					if (FHC_AjaxClient.isSuccess(response))
 					{
 						FHC_DialogLib.alertSuccess("Done!");
 						Stammdaten._updated();
+						PersonCheck.update(data)
 					}
 					else
 					{
-						FHC_DialogLib.alertError(FHC_AjaxClient.getError(data));
+						FHC_DialogLib.alertError(FHC_AjaxClient.getError(response));
 					}
 				},
 				errorCallback: function() {
@@ -149,6 +151,7 @@ var Stammdaten = {
 
 	_updated: function()
 	{
+
 		$('.kontakt_input').each(function() {
 			var span = $(this).parent('td').children('span');
 			var value = $(this).val();

public/js/lehre/lvplanung/LvTemplateUebersicht.js

@@ -0,0 +1,289 @@
+import {CoreFilterCmpt} from '../../components/filter/Filter.js';
+import CoreFormInput from "../../components/Form/Input.js";
+
+// Fields used to restructure table data for dataTree
+const idField = 'lehrveranstaltung_id';
+const parentIdField = 'lehrveranstaltung_template_id';
+const STUDIENSEMESTER_DROPDOWN_STARTDATE = '2011-01-01';
+
+export default {
+	components: {
+		CoreFilterCmpt,
+		CoreFormInput
+	},
+	data: function() {
+		return {
+			table: null,
+			studiensemester: [],
+			selectedStudiensemester: '',
+			cbDataTreeStartExpanded: false	// checkbox expand dataTree or not
+		}
+	},
+	computed: {
+		tabulatorOptions() {
+                        const fhcValuesLookup = function(cell) {
+                            var values = {};
+                            const field = cell.getField();
+                            const data = cell.getTable().getData();
+                            const collectvalues = function(rows, field) {
+                                var values = {};
+                                var childvalues = {};
+                                for(const row of rows) {
+                                    const rowvalue = (row[field] !== null) ? row[field] : '';
+                                    values[rowvalue] = rowvalue;
+                                    if(row['_children'] && row['_children'].length > 0) {
+                                      childvalues = collectvalues(row['_children'], field);
+                                      values = {...values, ...childvalues}
+                                    }
+                                }
+                                return values;
+                            }
+                            values = collectvalues(data, field);
+                            const vals = Object.keys(values).sort();
+                            if(vals.indexOf('') === -1) {
+                                vals.unshift('');
+                            }
+                            return vals;
+                        };
+                        const fhctreefilter = function(headerValue, rowValue, rowData, filterParams){
+                            if (rowData['_children'] && rowData['_children'].length > 0) {
+                               for (var i in rowData['_children']) {
+                                  return rowValue == headerValue || 
+                                            fhctreefilter(
+                                                headerValue, 
+                                                rowData['_children'][i][filterParams.field], 
+                                                rowData['_children'][i], 
+                                                filterParams
+                                            );
+                               }
+                            }
+
+                            return rowValue == headerValue;
+                        };
+			const self = this;
+			return {
+				// NOTE: data is set on table built to await preselected actual Studiensemester
+				ajaxResponse(url, params, response) {
+					return self.prepDataTreeData(response.data) // Prepare data for dataTree view
+				},
+				layout: 'fitColumns',
+				autoResize: false, // prevent auto resizing of table
+				resizableColumnFit: true, //maintain the fit of columns when resizing
+				index: 'lehrveranstaltung_id',
+				selectable: true,
+				selectableRangeMode: 'click',
+				dataTree: true,
+				dataTreeStartExpanded: self.cbDataTreeStartExpanded,
+				dataTreeChildIndent: 15, //indent child rows by 15 px
+				persistence:{
+					filter: false, //persist filter sorting
+				},
+				columns: [
+					{title: 'LV-ID', field: 'lehrveranstaltung_id', headerFilter: true, visible: false},
+					{title: 'LV Kurzbz', field: 'kurzbz', headerFilter: true, visible:false, width: 70},
+					{title: 'STG Kurzbz', field: 'stg_typ_kurzbz', headerFilter: "list", headerFilterParams: {valuesLookup: fhcValuesLookup}, headerFilterFunc: fhctreefilter, headerFilterFuncParams: {field: 'stg_typ_kurzbz'}, visible:true, width: 80},
+					{title: 'OrgEinheit', field: 'lv_oe_bezeichnung', headerFilter: true, visible: false, width: 250},
+					{title: 'Lehrtyp Kurzbz', field: 'lehrtyp_kurzbz', headerFilter: true, visible:false, width: 70},
+					{title: 'Studiengangtyp', field: 'stg_typ_bezeichnung', headerFilter: "list", headerFilterParams: {valuesLookup: fhcValuesLookup}, headerFilterFunc: fhctreefilter, headerFilterFuncParams: {field: 'stg_typ_bezeichnung'}, width: 150},
+					{title: 'OrgForm', field: 'orgform_kurzbz', headerFilter: "list", headerFilterParams: {valuesLookup: fhcValuesLookup}, headerFilterFunc: fhctreefilter, headerFilterFuncParams: {field: 'orgform_kurzbz'}, width: 70},
+					{title: 'Semester', field: 'semester', headerFilter: true, width: 50},
+					{title: 'Lehrveranstaltung', field: 'lv_bezeichnung', headerFilter: true, minWidth: 250},
+					{title: 'Lehrveranstaltung ENG', field: 'bezeichnung_english', headerFilter: true, minWidth: 250},
+					{title: 'ECTS', field: 'ects', headerFilter: true, width: 50, hozAlign: 'right'},
+					{title: 'Lehrform', field: 'lehrform_kurzbz', headerFilter: true, width: 50},
+					{title: 'Sprache', field: 'sprache', headerFilter: true, width: 100},
+					{title: 'Aktiv', field: 'aktiv', width: 50,
+						formatter:"tickCross",
+						headerFilter:"tickCross",
+						headerFilterParams:{"tristate": true},
+						hozAlign:"center",
+						formatterParams: {
+							tickElement: '<i class="fa fa-check text-success"></i>',
+							crossElement: '<i class="fa fa-xmark text-danger"></i>'
+						}
+					},
+					{title: 'Studienplan', field: 'studienplan_bezeichnung', headerFilter: true, visible:true, width: 220},
+					{title: 'OE Kurzbz', field: 'lv_oe_kurzbz', headerFilter: true, visible:false, minWidth: 80},
+					{
+						title: this.$p.t('global/aktionen'),
+						field: 'actions',
+						width: 140,
+						formatter: (cell, formatterParams, onRendered) => {
+							let container = document.createElement('div');
+							container.className = "d-flex gap-2";
+
+							let button = document.createElement('button');
+							button.className = 'btn btn-outline-secondary';
+							button.innerHTML = '<i class="fa fa-external-link"></i> ' + this.$p.t('global/verwalten');
+							button.addEventListener('click', (event) => this.openAdminLvTemplate(event, cell.getRow()));
+							container.append(button);
+
+							return container;
+						},
+						frozen: true
+					}
+				]
+			}
+		},
+		urlToAdminAllTemplates() {
+			return FHC_JS_DATA_STORAGE_OBJECT.app_root +
+				'vilesci/lehre/lehrveranstaltung.php?stg_kz=99999&semester=-1&orgform=-1';
+		}
+	},
+	methods: {
+		async loadAndSetStudiensemester(){
+			const result = await this.$fhcApi
+				.get('api/frontend/v1/organisation/Studiensemester/getAll', {start: STUDIENSEMESTER_DROPDOWN_STARTDATE})
+				.then(result => this.studiensemester = result.data )
+				.then(() => this.$fhcApi.get('api/frontend/v1/organisation/Studiensemester/getAktNext') ) // Get actual Studiensemester
+				.then(result =>  this.selectedStudiensemester = result.data[0].studiensemester_kurzbz ) // Preselect Studiensemester
+				.catch(error => this.$fhcAlert.handleSystemError(error) );
+		},
+		async onTableBuilt(){
+
+			this.table = this.$refs.lvTemplateUebersichtTable.tabulator;
+
+			// Await Studiensemester
+			await this.loadAndSetStudiensemester();
+
+			// Set table data
+			this.table.setData(
+				this.$fhcApi.getUri() +
+				'/api/frontend/v1/education/Lehrveranstaltung/getTemplateLvTree' +
+				'?studiensemester_kurzbz=' + this.selectedStudiensemester
+			);
+
+			// Await phrases categories
+			await this.$p.loadCategory(['lehre']);
+
+			// Replace column titles with phrasen
+			this.table.updateColumnDefinition('lv_bezeichnung', {title: this.$p.t('lehre', 'lehrveranstaltung')});
+
+		},
+		onChangeStudiensemester(){
+			// Reset table data
+			this.table.setData(
+				this.$fhcApi.getUri() +
+				'/api/frontend/v1/education/Lehrveranstaltung/getTemplateLvTree' +
+				'?studiensemester_kurzbz=' + this.selectedStudiensemester
+			);
+		},
+		openAdminLvTemplate(event, row){
+			const url = FHC_JS_DATA_STORAGE_OBJECT.app_root +
+				'vilesci/lehre/lehrveranstaltung.php?stg_kz=&semester=-1&orgform=-1&lehrveranstaltung_id=' +
+				row.getData().lehrveranstaltung_id;
+
+			window.open(url, '_blank').focus();
+		},
+		prepDataTreeData(data){
+			let toDelete = [];
+
+			// loop through all data
+			for (let childIdx = 0; childIdx < data.length; childIdx++)
+			{
+				let child = data[childIdx];
+
+				// if it has parent id, it is a child
+				if (child[parentIdField])
+				{
+					// append the child on the right place. If parent found, mark original sw child on 0 level for deleting
+					if (this._appendChild(data, child)) toDelete.push(childIdx);
+				}
+			}
+
+			// delete the marked children from 0 level
+			for (let counter = 0; counter < toDelete.length; counter++)
+			{
+				// decrease index by counter as index of data array changes after every deletion
+				data.splice(toDelete[counter] - counter, 1);
+			}
+
+			return data;
+		},
+		_appendChild(data, child) {
+			// get parent id
+			let parentId = child[parentIdField];
+
+			// loop thorugh all data
+			for (let parentIdx = 0; parentIdx < data.length; parentIdx++)
+			{
+				let parent = data[parentIdx];
+
+				// if it's the parent
+				if (parent[idField] == parentId)
+				{
+					// create children array if not done yet
+					if (!parent._children) parent._children = [];
+
+					// if child is not included in children array, append the child
+					if (!parent._children.includes(child)) parent._children.push(child);
+
+					// parent found
+					return true;
+				}
+				// search children for parents
+				else if (parent._children) this._appendChild(parent._children, child);
+			}
+
+			// parent not found
+			return false;
+		},
+		reloadTabulator() {
+			if (this.table !== null && this.table !== undefined)
+			{
+				for (let option in this.tabulatorOptions)
+				{
+					if (this.table.options.hasOwnProperty(option))
+						this.table.options[option] = this.tabulatorOptions[option];
+				}
+				this.$refs.lvTemplateUebersichtTable.reloadTable();
+			}
+		},
+	},
+	template: `
+<div class="lvTemplateUebersicht overflow-hidden">
+	<div class="row d-flex mb-3">
+		<div class="col-10 h2 mb-4">{{ $p.t('lehre/lvTemplatesUebersicht') }}</div>
+		<div class="col-2 ms-auto align-self-end">
+			<core-form-input
+				type="select"
+				v-model="selectedStudiensemester"
+				name="studiensemester"
+				@change="onChangeStudiensemester">
+				<option 
+				v-for="(studSem, index) in studiensemester"
+				:key="index" 
+				:value="studSem.studiensemester_kurzbz">
+					{{studSem.studiensemester_kurzbz}}
+				</option>
+			</core-form-input>
+		</div>
+	</div>
+	<div class="row mb-5">
+		<div class="col">
+			<core-filter-cmpt
+				ref="lvTemplateUebersichtTable"
+				uniqueId="lvTemplateUebersichtTable"
+				table-only
+				:side-menu="false"
+				:tabulator-options="tabulatorOptions"
+				:tabulator-events="[{event: 'tableBuilt', handler: onTableBuilt}]">
+				<template v-slot:actions>
+					<a type="button" class="btn btn-primary" :href="urlToAdminAllTemplates" target="_blank"><i class="fa fa-external-link me-2"></i>{{ $p.t('lehre/lvTemplatesVerwalten') }}</a>
+					<div class="form-check form-check-inline">
+						<input
+							class="form-check-input"
+							type="checkbox"
+							v-model="cbDataTreeStartExpanded"
+							:checked="cbDataTreeStartExpanded"
+							@change="reloadTabulator">
+						<label class="form-check-label">Templates {{ $p.t('global/aufgeklappt') }}</label>
+					</div>
+				</template>
+			</core-filter-cmpt>						
+		</div>
+	</div>
+
+</div>
+`
+};

public/js/plugin/FhcAlert.js

@@ -394,5 +394,6 @@ export default {
 			}
 		};
 		app.config.globalProperties.$fhcAlert = $fhcAlert;
+                app.provide('$fhcAlert', app.config.globalProperties.$fhcAlert);
 	}
 }

public/js/plugin/FhcApi.js

@@ -316,6 +316,6 @@ export default {
 		const mergedFhcApiFactory = options?.factory ? {...FhcApiFactory, ...options.factory} : FhcApiFactory;
 
 		app.config.globalProperties.$fhcApi.factory = new FhcApiFactoryWrapper(mergedFhcApiFactory);
-
+                app.provide('$fhcApi', app.config.globalProperties.$fhcApi);
 	}
 };

public/js/plugin/Phrasen.js

@@ -69,5 +69,6 @@ export default {
 			loadCategory: cat => phrasen.loadCategory.call(app, cat),
 			t_ref: phrasen.t_ref
 		};
+                app.provide('$p', app.config.globalProperties.$p);
 	}
 }

system/dbupdate_3.4.php

@@ -58,6 +58,7 @@ require_once('dbupdate_3.4/17513_Entwicklungsteam.php');
 require_once('dbupdate_3.4/28575_softwarebereitstellung.php');
 require_once('dbupdate_3.4/41150_oe-pfad_db_view.php');
 require_once('dbupdate_3.4/44031_stv_favorites.php');
+require_once('dbupdate_3.4/40896_kennzeichnung_unruly_person.php');
 
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';
@@ -301,7 +302,7 @@ $tabellen=array(
 	"public.tbl_ortraumtyp"  => array("ort_kurzbz","hierarchie","raumtyp_kurzbz"),
 	"public.tbl_organisationseinheit" => array("oe_kurzbz", "oe_parent_kurzbz", "bezeichnung","organisationseinheittyp_kurzbz", "aktiv","mailverteiler","freigabegrenze","kurzzeichen","lehre","standort","warn_semesterstunden_frei","warn_semesterstunden_fix","standort_id"),
 	"public.tbl_organisationseinheittyp" => array("organisationseinheittyp_kurzbz", "bezeichnung", "beschreibung"),
-	"public.tbl_person"  => array("person_id","staatsbuergerschaft","geburtsnation","sprache","anrede","titelpost","titelpre","nachname","vorname","vornamen","gebdatum","gebort","gebzeit","foto","anmerkung","homepage","svnr","ersatzkennzeichen","familienstand","geschlecht","anzahlkinder","aktiv","insertamum","insertvon","updateamum","updatevon","ext_id","bundesland_code","kompetenzen","kurzbeschreibung","zugangscode", "foto_sperre","matr_nr","zugangscode_timestamp","udf_values","bpk","matr_aktiv","wahlname"),
+	"public.tbl_person"  => array("person_id","staatsbuergerschaft","geburtsnation","sprache","anrede","titelpost","titelpre","nachname","vorname","vornamen","gebdatum","gebort","gebzeit","foto","anmerkung","homepage","svnr","ersatzkennzeichen","familienstand","geschlecht","anzahlkinder","aktiv","insertamum","insertvon","updateamum","updatevon","ext_id","bundesland_code","kompetenzen","kurzbeschreibung","zugangscode", "foto_sperre","matr_nr","zugangscode_timestamp","udf_values","bpk","matr_aktiv","wahlname","unruly"),
 	"public.tbl_person_fotostatus"  => array("person_fotostatus_id","person_id","fotostatus_kurzbz","datum","insertamum","insertvon","updateamum","updatevon"),
 	"public.tbl_personfunktionstandort"  => array("personfunktionstandort_id","funktion_kurzbz","person_id","standort_id","position","anrede"),
 	"public.tbl_preincoming"  => array("preincoming_id","person_id","mobilitaetsprogramm_code","zweck_code","firma_id","universitaet","aktiv","bachelorthesis","masterthesis","von","bis","uebernommen","insertamum","insertvon","updateamum","updatevon","anmerkung","zgv","zgv_ort","zgv_datum","zgv_name","zgvmaster","zgvmaster_datum","zgvmaster_ort","zgvmaster_name","program_name","bachelor","master","jahre","person_id_emergency","person_id_coordinator_dep","person_id_coordinator_int","code","deutschkurs1","deutschkurs2","research_area","deutschkurs3","ext_id"),
@@ -477,4 +478,4 @@ if (!$result=@$db->db_query($sql_query))
 		}
 if($error==false)
 	echo '<br>Gegenpruefung fehlerfrei';
-?>
+?>

system/dbupdate_3.4/28260_vertraege.php

@@ -85,6 +85,8 @@ if ($result = $db->db_query("SELECT * FROM information_schema.tables WHERE table
 			betrag bytea,
 			gehaltsbestandteil_id integer,
 			mitarbeiter_uid character varying(32),
+			gehaltsbestandteil_von date,
+			gehaltsbestandteil_bis date,
 			CONSTRAINT tbl_gehaltshistorie_pk PRIMARY KEY (gehaltshistorie_id)
 		);
 
@@ -570,3 +572,37 @@ if ($result = $db->db_query("SELECT * FROM hr.tbl_vertragsart WHERE vertragsart_
 			echo 'Vertragsart "Dienstverhältnis zu einer anderen Bildungseinrichtung oder einem anderen Träger" erstellt.<br />';
 	}
 }
+
+if ($result = $db->db_query("SELECT * FROM information_schema.columns WHERE column_name='gehaltsbestandteil_von' AND table_name='tbl_gehaltshistorie' AND table_schema='hr'"))
+{
+	if ($db->db_num_rows($result) == 0)
+	{
+		$qry = "
+		    ALTER TABLE 
+			hr.tbl_gehaltshistorie 
+		    ADD COLUMN
+			gehaltsbestandteil_von date
+		";
+		if (! $db->db_query($qry))
+			echo '<strong>Vertraege: ' . $db->db_last_error() . '</strong><br>';
+		else
+			echo 'Spalte gehaltsbestandteil_von wurde in hr.tbl_gehaltshistorie neu erstellt<br>';
+	}
+}
+
+if ($result = $db->db_query("SELECT * FROM information_schema.columns WHERE column_name='gehaltsbestandteil_bis' AND table_name='tbl_gehaltshistorie' AND table_schema='hr'"))
+{
+	if ($db->db_num_rows($result) == 0)
+	{
+		$qry = "
+		    ALTER TABLE 
+			hr.tbl_gehaltshistorie 
+		    ADD COLUMN
+			gehaltsbestandteil_bis date
+		";
+		if (! $db->db_query($qry))
+			echo '<strong>Vertraege: ' . $db->db_last_error() . '</strong><br>';
+		else
+			echo 'Spalte gehaltsbestandteil_bis wurde in hr.tbl_gehaltshistorie neu erstellt<br>';
+	}
+}

system/dbupdate_3.4/40896_kennzeichnung_unruly_person.php

@@ -0,0 +1,17 @@
+<?php
+if (! defined('DB_NAME')) exit('No direct script access allowed');
+
+// add unruly column public.tbl_person
+if($result = $db->db_query("SELECT 1 FROM information_schema.columns WHERE table_schema = 'public' 
+                                           AND table_name = 'tbl_person' AND column_name = 'unruly'"))
+{
+	if($db->db_num_rows($result) === 0)
+	{
+		$qry = "ALTER TABLE tbl_person ADD COLUMN unruly BOOLEAN NOT NULL DEFAULT FALSE";
+
+		if(!$db->db_query($qry))
+			echo '<strong>Public Tabelle person: '.$db->db_last_error().'</strong><br>';
+		else
+			echo '<br>spalte unruly hinzugefuegt';
+	}
+}

system/dbupdate_3.4/41150_oe-pfad_db_view.php

@@ -1,15 +1,11 @@
 <?php
 if (! defined('DB_NAME')) exit('No direct script access allowed');
 
-if ($result = $db->db_query("SELECT * FROM information_schema.views WHERE table_catalog = '" . DB_NAME . "' AND table_schema = 'public' AND table_name = 'vw_oe_path'"))
-{
-    if($db->db_num_rows($result) == 0)
-    {
-	$qry = "
+$qry = "
 	    CREATE OR REPLACE VIEW public.vw_oe_path AS
-		WITH RECURSIVE vw_oe_path(oe_kurzbz, bezeichnung, oe_parent_kurzbz, organisationseinheittyp_kurzbz, oetyp_bezeichnung, depth, path) AS (
+		WITH RECURSIVE vw_oe_path(oe_kurzbz, bezeichnung, oe_parent_kurzbz, organisationseinheittyp_kurzbz, oetyp_bezeichnung, depth, path, path_kurzbz) AS (
 		  SELECT 
-		    oe.oe_kurzbz, oe.bezeichnung, oe.oe_parent_kurzbz, oe.organisationseinheittyp_kurzbz, oetyp.bezeichnung AS oetyp_bezeichnung, 0, '/' || oetyp.bezeichnung || ' ' || oe.bezeichnung AS path 
+		    oe.oe_kurzbz, oe.bezeichnung, oe.oe_parent_kurzbz, oe.organisationseinheittyp_kurzbz, oetyp.bezeichnung AS oetyp_bezeichnung, 0, '/' || oetyp.bezeichnung || ' ' || oe.bezeichnung AS path, '/' || oe.oe_kurzbz AS path_kurzbz
 		  FROM 
 		    public.tbl_organisationseinheit oe
 		  JOIN
@@ -18,7 +14,7 @@ if ($result = $db->db_query("SELECT * FROM information_schema.views WHERE table_
 		    oe.oe_parent_kurzbz IS NULL
 		  UNION ALL
 		  SELECT 
-		    oe.oe_kurzbz, oe.bezeichnung, oe.oe_parent_kurzbz, oe.organisationseinheittyp_kurzbz, oetyp.bezeichnung AS oetyp_bezeichnung, depth + 1, oet.path || '/'  || oetyp.bezeichnung || ' ' || oe.bezeichnung
+		    oe.oe_kurzbz, oe.bezeichnung, oe.oe_parent_kurzbz, oe.organisationseinheittyp_kurzbz, oetyp.bezeichnung AS oetyp_bezeichnung, depth + 1, oet.path || '/'  || oetyp.bezeichnung || ' ' || oe.bezeichnung, oet.path_kurzbz || '/' || oe.oe_kurzbz AS path_kurzbz
 		  FROM 
 		    public.tbl_organisationseinheit oe, vw_oe_path oet
 		  JOIN
@@ -29,11 +25,27 @@ if ($result = $db->db_query("SELECT * FROM information_schema.views WHERE table_
 		SELECT * FROM vw_oe_path ORDER BY path, depth;
 
 		GRANT SELECT ON public.vw_oe_path TO vilesci;
-		";
-	
+";
+
+
+if ($result = $db->db_query("SELECT * FROM information_schema.views WHERE table_catalog = '" . DB_NAME . "' AND table_schema = 'public' AND table_name = 'vw_oe_path'"))
+{
+    if($db->db_num_rows($result) == 0)
+    {
 	if (!$db->db_query($qry))
 		echo '<strong>public.vw_oe_path: ' . $db->db_last_error() . '</strong><br />';
 	else
 		echo 'public.vw_oe_path: erstellt<br />';
     }
 }
+
+if ($result = $db->db_query("SELECT * FROM information_schema.columns WHERE table_catalog = '" . DB_NAME . "' AND table_schema = 'public' AND table_name = 'vw_oe_path' AND column_name = 'path_kurzbz'"))
+{
+    if($db->db_num_rows($result) == 0)
+    {
+	if (!$db->db_query($qry))
+		echo '<strong>public.vw_oe_path: ' . $db->db_last_error() . '</strong><br />';
+	else
+		echo 'public.vw_oe_path: neu erstellt mit zusätzlicher spalte path_kurzbz<br />';
+    }
+}

system/filtersupdate.php

@@ -1298,6 +1298,7 @@ $filters = array(
 					{"name": "os"},
 					{"name": "lizenzserver_kurzbz"},
 					{"name": "lizenzserver_port"},
+					{"name": "anzahl_lizenzen"},
 					{"name": "softwarestatus_kurzbz"}
 				],
 				"filters": []

system/phrasesupdate.php

@@ -2662,6 +2662,26 @@ $phrases = array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'person',
+		'phrase' => 'unruly',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Unruly',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Unruly',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'person',
@@ -5321,6 +5341,26 @@ The invoice will be sent to you again. <u><strong>The amount is only to be trans
 			)
 		)
 	),
+	array(
+		'app' => 'infocenter',
+		'category' => 'infocenter',
+		'phrase' => 'unrulyPersonFound',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Unruly Person wurde gefunden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Unruly Person detected',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'password',
@@ -9987,13 +10027,13 @@ Any unusual occurrences
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Der Plagiatscheck wurde durchgeführt und bestätigt, dass der zentrale Inhalt der Arbeit im erforderlichen Ausmaß eigenständig verfasst wurde (vgl. Satzungsteil Studienrechtliche Bestimmungen / Prüfungsordnung, § 18 Abs. 2 und 3).',
+				'text' => 'Der Plagiatscheck wurde durchgeführt und bestätigt, dass der zentrale Inhalt der Arbeit im erforderlichen Ausmaß eigenständig verfasst wurde (vgl. Satzungsteil Studienrechtliche Bestimmungen / Prüfungsordnung, § 20 Abs. 2 und 3).',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'The plagiarism check has been carried out and confirms that the central content of the thesis has been written independently to the required extent (cf. part of the Statutes on Studies Act Provisions / Examination Regulations, § 18 Para. 2 and 3).',
+				'text' => 'The plagiarism check has been carried out and confirms that the central content of the thesis has been written independently to the required extent (cf. part of the Statutes on Studies Act Provisions / Examination Regulations, § 20 Para. 2 and 3).',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -21190,6 +21230,46 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'antrag_unruly',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Unruly',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Unruly',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'antrag_unruly_updated',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Unruly Person Status wurde aktualisiert.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Unruly person status has been updated.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'studierendenantrag',
@@ -23531,6 +23611,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'textLong_unruly',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Person ist unruly',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Person is unruly',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'studierendenantrag',
@@ -23711,6 +23811,46 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'dropdown_unruly',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Person ist unruly.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Person is unruly.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'mark_person_as_unruly',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Person ist unruly.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Person is unruly.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'notiz',
@@ -29198,6 +29338,446 @@ array(
 		)
 	),
 	// Betriebsmittel end
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'softwareanforderung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Softwareanforderung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Software Request',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'softwareanforderungSubtitle',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Softwareanforderung und Lizenzmanagement für die Lehre',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Software Request and License management for Education',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'swAnforderungenUndLizenen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Softwareanforderungen & Lizenzen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Software Requirements & Licenses',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'anforderungNachSw',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Anforderung nach Software',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Request by Software',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'anforderungNachLv',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Anforderung nach LV',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Request by Course',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'swNichtGefundenHierBestellen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Software nicht gefunden?<br>Hier bei IT-Services bestellen",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Software not found?<br>Order here from IT Services",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'bereitsAngefordert',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Bereits angefordert",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Requested already",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'mindEineZuorndungExistiertBereits',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Mindestens eine Zuordnung existiert bereits.",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "At least one assignment already exists.",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'swFuerLvAnfordern',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Software für LV anfordern",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Request software for courses",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'swWurdeBereitsAngefordert',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Software wurde bereits angefordert",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Software has already been requested",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'swAnforderungUeberAuswahlVonSw',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Softwareanforderung über die Auswahl von Software",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Software Requirements based on the Selection of Software",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'swAnforderungUeberAuswahlVonLvs',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Softwareanforderung über die Auswahl von Lehrveranstaltungen",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Software Requirements based on the Selection of Courses",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'lizenzAnzahlNeu',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Lizenz-Anzahl NEU",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "License Number NEW",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'lizenzanzahlAendern',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Lizenzanzahl ändern",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Change Number of Licenses",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'eingabeFehlt',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Eingabe fehlt",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Input missing",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'unveraendert',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Unverändert",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Unchanged",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'anforderungenVorruecken',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Anforderungen vorrücken",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Take over Requirements",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'vorrueckenInStudiensemester',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Vorrücken in Studiensemester",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Take over to semester",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'softwarebereitstellung',
+		'category' => 'global',
+		'phrase' => 'anteiligInProzent',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Anteilig in %",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Percentage share",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'global',
+		'phrase' => 'verwalten',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Verwalten",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Administrate",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'lvTemplatesVerwalten',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "LV Templates verwalten",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Administrate Course Templates",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'lvTemplatesUebersicht',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "LV Templates Übersicht",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Course Templates Overview",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	//****************************	 CORE/konto
 	array(
 		'app' => 'core',

vilesci/cronjobs/bpk.php

@@ -27,6 +27,7 @@ require_once(dirname(__FILE__).'/../../include/basis_db.class.php');
 require_once(dirname(__FILE__).'/../../include/dvb.class.php');
 require_once(dirname(__FILE__).'/../../include/benutzerberechtigung.class.php');
 require_once(dirname(__FILE__).'/../../include/datum.class.php');
+require_once(dirname(__FILE__).'/../../include/kennzeichen.class.php');
 require_once(dirname(__FILE__).'/../../include/errorhandler.class.php');
 
 if (!$db = new basis_db())
@@ -34,6 +35,7 @@ if (!$db = new basis_db())
 
 $limit = '';
 $debug = false;
+$vbpkTypes = defined('VBPK_TYPES') && is_array(VBPK_TYPES) ? VBPK_TYPES : null;
 
 // Wenn das Script nicht ueber Commandline gestartet wird, muss eine
 // Authentifizierung stattfinden
@@ -85,8 +87,27 @@ if (defined('BPK_FUER_ALLE_BENUTZER_ABFRAGEN') && BPK_FUER_ALLE_BENUTZER_ABFRAGE
 		JOIN public.tbl_benutzer USING(person_id)
 	WHERE
 		public.tbl_benutzer.aktiv = true
-		AND tbl_person.bpk is null
-		AND gebdatum is not null";
+		AND
+		(
+			tbl_person.bpk is null";
+
+	// checken, ob vBpks fehlen
+	if (isset($vbpkTypes))
+	{
+		$qry .=
+		" OR (
+				SELECT
+					COUNT(DISTINCT kennzeichentyp_kurzbz)
+				FROM
+					public.tbl_kennzeichen
+				WHERE
+					person_id = tbl_person.person_id
+					AND kennzeichentyp_kurzbz IN (".$db->implode4SQL($vbpkTypes).")
+			) < ".$db->db_add_param(count($vbpkTypes), FHC_INTEGER);
+	}
+
+	$qry .=
+		") AND gebdatum is not null";
 }
 else
 {
@@ -100,8 +121,27 @@ else
 	WHERE
 		public.tbl_benutzer.aktiv = true
 		AND tbl_person.matr_nr is not null
-		AND tbl_person.bpk is null
-		AND studiengang_kz<10000
+		AND
+		(
+			tbl_person.bpk is null";
+
+	// checken, ob vBpks fehlen
+	if (isset($vbpkTypes))
+	{
+		$qry .=
+		" OR (
+				SELECT
+					COUNT(DISTINCT kennzeichentyp_kurzbz)
+				FROM
+					public.tbl_kennzeichen
+				WHERE
+					person_id = tbl_person.person_id
+					AND kennzeichentyp_kurzbz IN (".$db->implode4SQL($vbpkTypes).")
+			) < ".$db->db_add_param(count($vbpkTypes), FHC_INTEGER);
+	}
+
+	$qry .=
+	") AND studiengang_kz<10000
 		AND EXISTS(SELECT 1 FROM public.tbl_prestudent WHERE person_id=tbl_person.person_id AND bismelden=true)
 		AND gebdatum is not null";
 }
@@ -135,6 +175,50 @@ if ($result = $db->db_query($qry))
 						echo ' OK';
 					else
 						echo ' Failed: '.$person->errormsg;
+
+					$vbpkErrors = array();
+
+					// alle existierenden vBpks einer Person holen
+					$kennzeichenTypes = new kennzeichen();
+					if ($kennzeichenTypes->load_pers($row->person_id, $vbpkTypes))
+					{
+						$existingVbpks = $kennzeichenTypes->result;
+
+						foreach ($data->retval->vbpks as $vbpkType => $vbpkValue)
+						{
+							$new = true;
+							foreach ($existingVbpks as $existingVbpk)
+							{
+								// nicht speichern, wenn vBpk bereits vorhanden
+								if ($existingVbpk->kennzeichentyp_kurzbz == $vbpkType)
+								{
+									$new = false;
+									break;
+								}
+							}
+
+							if (!$new) continue;
+
+							// neue vBpk speichern
+							$kennzeichen = new kennzeichen();
+
+							$kennzeichen->person_id = $row->person_id;
+							$kennzeichen->kennzeichentyp_kurzbz = $vbpkType;
+							$kennzeichen->inhalt = $vbpkValue;
+							$kennzeichen->aktiv = true;
+							$kennzeichen->insertvon = 'bpkJob';
+
+							if (!$kennzeichen->save())
+							{
+								$vbpkErrors[] = 'Failed to save vBpk '.$vbpkType.':'.$kennzeichen->errormsg;
+							}
+						}
+					}
+
+					if (count($vbpkErrors) > 0)
+					{
+						echo implode('; ', $vbpkErrors);
+					}
 				}
 			}
 			else

vilesci/stammdaten/reihungstestverwaltung.php

@@ -256,9 +256,9 @@ if(isset($_GET['excel']))
 				SELECT studiensemester_kurzbz
 				FROM PUBLIC.tbl_studiensemester
 				WHERE studiensemester_kurzbz = rt.studiensemester_kurzbz
-				
+
 				UNION
-				
+
 				(
 					SELECT studiensemester_kurzbz
 					FROM PUBLIC.tbl_studiensemester
@@ -269,9 +269,9 @@ if(isset($_GET['excel']))
 							)
 					ORDER BY ende DESC LIMIT 1
 					)
-				
+
 				UNION
-				
+
 				(
 					SELECT studiensemester_kurzbz
 					FROM PUBLIC.tbl_studiensemester
@@ -820,8 +820,8 @@ if(isset($_GET['excel']))
 		<title>Reihungstest</title>
 		<link rel="stylesheet" href="../../skin/vilesci.css" type="text/css">
 		<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-		
-		<?php 
+
+		<?php
 			include('../../include/meta/jquery.php');
 			include('../../include/meta/jquery-tablesorter.php');
 		?>
@@ -951,15 +951,15 @@ if(isset($_GET['excel']))
 				});
 
 				$("#studienplan_autocomplete").autocomplete({
-					source: function(request, response) 
+					source: function(request, response)
 					{
-						$.getJSON("reihungstestverwaltung_autocomplete.php", 
-						{ 
+						$.getJSON("reihungstestverwaltung_autocomplete.php",
+						{
 							autocomplete: 'studienplan',
 							aktiv: 'true',
 							studiensemester_kurzbz: $('#studiensemester_dropdown').val(),
 							term: request.term
-						}, 
+						},
 						response);
 					},
 					minLength:2,
@@ -1247,7 +1247,7 @@ if(isset($_GET['excel']))
 				});
 				window.location.href = "mailto:?bcc="+mailadressen;
 			}
-			
+
 			function SendMessage()
 			{
 				// Wenn Checkboxen markiert sind, an diese senden, sonst an alle
@@ -1411,7 +1411,7 @@ if(isset($_POST['speichern']) || isset($_POST['kopieren']))
 		$reihungstest->insertvon = $user;
 		$reihungstest->insertamum = date('Y-m-d H:i:s');
 	}
-	
+
 	// OE über Studiengang des Reihungstests laden und Berechtigung prüfen
 	$stg_rechtecheck = new studiengang($reihungstest->studiengang_kz);
 	if(!$rechte->isBerechtigt('lehre/reihungstest', $stg_rechtecheck->oe_kurzbz, 'sui'))
@@ -1439,7 +1439,7 @@ if(isset($_POST['speichern']) || isset($_POST['kopieren']))
 			$error = true;
 		}
 	}
-	
+
 	if (isset($_POST['zugangs_ueberpruefung']) && $_POST['zugangcode'] === '')
 	{
 		$messageError .= '<p>Der Zugangscode muss ausgefüllt sein, wenn die Zugangsüberprüfung aktiviert ist. </p>';
@@ -1548,7 +1548,7 @@ if(isset($_POST['speichern']) || isset($_POST['kopieren']))
 					$rt_stpl->new = true;
 					$rt_stpl->reihungstest_id = $reihungstest->reihungstest_id;
 					$rt_stpl->studienplan_id = $studienplan;
-					
+
 					if (!in_array($studienplan, $rt_stplaeneArray))
 					{
 						if (!$rt_stpl->saveStudienplanReihungstest())
@@ -1572,7 +1572,7 @@ if(isset($_POST['speichern']) || isset($_POST['kopieren']))
 				$rt_studienplan = new reihungstest();
 				$rt_studienplan->getStudienplaeneReihungstest($_POST['reihungstest_id']);
 				$error = false;
-				foreach ($rt_studienplan->result as $row) 
+				foreach ($rt_studienplan->result as $row)
 				{
 					$rtKopieStudienplan = new reihungstest();
 					$rtKopieStudienplan->new = true;
@@ -1609,7 +1609,7 @@ if(isset($_POST['speichern']) || isset($_POST['kopieren']))
 				{
 					$messageSuccess .= '<p>Der Termin wurde erfolgreich kopiert</p>';
 				}
-				else 
+				else
 				{
 					$messageSuccess .= '<p>Neuer Reihungstesttermin erfolgreich angelegt</p>';
 				}
@@ -1666,14 +1666,14 @@ if(isset($_POST['raumzuteilung_speichern']))
 		{
 			die($raumzuteilung->errormsg);
 		}
-		
+
 		// OE über Studiengang des Reihungstests laden und Berechtigung prüfen
 		$stg_rechtecheck = new studiengang($raumzuteilung->studiengang_kz);
 		if(!$rechte->isBerechtigt('lehre/reihungstest', $stg_rechtecheck->oe_kurzbz, 'su'))
 		{
 			die($rechte->errormsg);
 		}
-		
+
 		if (isset($_POST['checkbox']))
 		{
 			$person_ids = $_POST['checkbox'];
@@ -1914,7 +1914,7 @@ if(isset($_GET['type']) && $_GET['type']=='auffuellen')
 		{
 			die($rechte->errormsg);
 		}
-		
+
 		$orte = new Reihungstest();
 		$orte->getOrteReihungstest($reihungstest_id);
 
@@ -2001,7 +2001,7 @@ if(isset($_POST['aufsicht']) && $_POST['aufsicht']!='' && !isset($_POST['kopiere
 		{
 			die($rechte->errormsg);
 		}
-		
+
 		//Reihungstest laden
 		if(!$save_aufsicht->load($_POST['reihungstest_id']))
 		{
@@ -2047,7 +2047,7 @@ if(isset($_POST['delete_ort']))
 		{
 			die($rechte->errormsg);
 		}
-		
+
 		$delete_ort = new reihungstest();
 		$delete_ort->getPersonReihungstestOrt($_POST['reihungstest_id'], $_POST['delete_ort']);
 
@@ -2119,7 +2119,7 @@ echo "<OPTION value='".$_SERVER['PHP_SELF']."?stg_kz=-1&studiensemester_kurzbz="
 foreach ($studiengang->result as $row)
 {
 	$stg_arr[$row->studiengang_kz] = $row->kuerzel;
-	
+
 	if ($typ != $row->typ || $typ == '')
 	{
 		if ($typ != '')
@@ -2128,14 +2128,14 @@ foreach ($studiengang->result as $row)
 		}
 		echo '<optgroup label="'.($types->studiengang_typ_arr[$row->typ] != ''?$types->studiengang_typ_arr[$row->typ]:$row->typ).'">';
 	}
-	
+
 	if ($stg_kz == '')
 		$stg_kz = $row->studiengang_kz;
 	if ($row->studiengang_kz == $stg_kz)
 		$selected = 'selected';
 	else
 		$selected = '';
-	
+
 	echo "<OPTION value='" . $_SERVER['PHP_SELF'] . "?stg_kz=$row->studiengang_kz&studiensemester_kurzbz=$studiensemester_kurzbz' $selected>" . $db->convert_html_chars($row->kuerzel) . " (" . $db->convert_html_chars($row->bezeichnung) . ")</OPTION>" . "\n";
 	$typ = $row->typ;
 }
@@ -2293,7 +2293,7 @@ $studienplaene_list = implode(',', array_keys($studienplaene_arr));
 			<td>
 				<select name='stufe'>
 				<option value=''>-- keine Auswahl --</option>
-					<?php 
+					<?php
 							// An der FHTW wird eine Beschreibung neben der Stufe angezeigt
 							if (defined('DOMAIN') && DOMAIN == 'technikum-wien.at')
 							{
@@ -2306,6 +2306,8 @@ $studienplaene_list = implode(',', array_keys($studienplaene_arr));
 								echo '<option value="1" '.($reihungstest->stufe == 1 ? 'selected' : '').'>1</option>';
 								echo '<option value="2" '.($reihungstest->stufe == 2 ? 'selected' : '').'>2</option>';
 								echo '<option value="3" '.($reihungstest->stufe == 3 ? 'selected' : '').'>3</option>';
+								echo '<option value="4" '.($reihungstest->stufe == 4 ? 'selected' : '').'>4</option>';
+								echo '<option value="5" '.($reihungstest->stufe == 5 ? 'selected' : '').'>5</option>';
 							}
 					?>
 				</select>
@@ -2575,7 +2577,7 @@ $studienplaene_list = implode(',', array_keys($studienplaene_arr));
 		<tr>
 			<td></td>
 			<td>
-				<?php 	
+				<?php
 					if(!$neu)
 					{
 						if($rechte->isBerechtigt('lehre/reihungstest',  $stg_rechtecheck->oe_kurzbz, 'sui'))
@@ -2588,7 +2590,7 @@ $studienplaene_list = implode(',', array_keys($studienplaene_arr));
 					{
 						echo '<button type="submit" name="speichern">Neu anlegen</button>';
 					}
-					
+
 					if($rechte->isBerechtigt('lehre/reihungstest',  $stg_rechtecheck->oe_kurzbz, 'suid'))
 					{
 						$anzahl_teilnehmer = new reihungstest();
@@ -2701,9 +2703,9 @@ if($reihungstest_id!='')
 			SELECT studiensemester_kurzbz
 			FROM PUBLIC.tbl_studiensemester
 			WHERE studiensemester_kurzbz = rt.studiensemester_kurzbz
-			
+
 			UNION
-			
+
 			(
 				SELECT studiensemester_kurzbz
 				FROM PUBLIC.tbl_studiensemester
@@ -2714,9 +2716,9 @@ if($reihungstest_id!='')
 						)
 				ORDER BY ende DESC LIMIT 1
 				)
-			
+
 			UNION
-			
+
 			(
 				SELECT studiensemester_kurzbz
 				FROM PUBLIC.tbl_studiensemester
@@ -3152,7 +3154,7 @@ if($reihungstest_id!='')
 					echo '</div>';
 			}
 		}
-} 
+}
 
 /**
  * Liefert die interne Empfangsadresse des Studiengangs fuer den Mailversand.
@@ -3168,18 +3170,18 @@ if($reihungstest_id!='')
 function getMailEmpfaenger($studiengang_kz, $studienplan_id = null, $orgform_kurzbz = null)
 {
 	$studiengang = new studiengang($studiengang_kz);
-	
+
 	if ($studienplan_id != '')
 	{
 		$studienplan = new studienplan();
 		$studienplan->loadStudienplan($studienplan_id);
 	}
-	
+
 	$empf_array = array();
 	$empfaenger = '';
 	if(defined('BEWERBERTOOL_BEWERBUNG_EMPFAENGER'))
 		$empf_array = unserialize(BEWERBERTOOL_BEWERBUNG_EMPFAENGER);
-		
+
 	// Umgehung für FHTW. Ausprogrammiert im Code
 	if(defined('BEWERBERTOOL_MAILEMPFANG') && BEWERBERTOOL_MAILEMPFANG != '')
 	{
@@ -3199,7 +3201,7 @@ function getMailEmpfaenger($studiengang_kz, $studienplan_id = null, $orgform_kur
 	}
 	else
 		$empfaenger = $studiengang->email;
-		
+
 	if ($empfaenger != '')
 		return $empfaenger;
 	else