Merge branch 'master' into feature-40319/SWB_Software-und-Lizenzanforderung

# Conflicts:
#	system/phrasesupdate.php

application/config/navigation.php

@@ -55,12 +55,6 @@ $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',
@@ -293,15 +287,6 @@ $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

@@ -1,141 +0,0 @@
-<?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

@@ -1,65 +0,0 @@
-<?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

@@ -1,118 +0,0 @@
-<?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/codex/UHSTAT1.php

@@ -5,12 +5,8 @@ if (! defined("BASEPATH")) exit("No direct script access allowed");
 class UHSTAT1 extends FHC_Controller
 {
 	const BERECHTIGUNG_UHSTAT_VERWALTEN = 'student/uhstat1daten_verwalten';
-	const LOGIN_SESSION_INDEX = 'bewerbung/user';
 	const PERSON_ID_SESSION_INDEX = 'bewerbung/personId';
 	const CODEX_OESTERREICH = 'A';
-	const CODEX_UNKNOWN_YEAR = 9999;
-	const CODEX_UNKNOWN_NATION = 'XXX';
-	const CODEX_UNKNOWN_BILDUNGMAX = 999;
 	const LOWER_BOUNDARY_YEARS = 160;
 	const UPPER_BOUNDARY_YEARS = 20;
 
@@ -214,9 +210,7 @@ class UHSTAT1 extends FHC_Controller
 		else
 			return true;
 
-		// if no Bildungsstaat or Bildungmax unknown - valid
-		if (!isset($bildungsstaat) || $bildungmax == self::CODEX_UNKNOWN_BILDUNGMAX) return true;
-
+		if (!isset($bildungsstaat)) return true;
 
 		// find out if abschluss is in Austria
 		$this->AbschlussModel->addSelect("in_oesterreich");
@@ -225,11 +219,8 @@ class UHSTAT1 extends FHC_Controller
 		if (hasData($abschlussRes))
 		{
 			$in_oesterreich = getData($abschlussRes)[0]->in_oesterreich;
-
-			// valid if Bildungsstaat and Abschluss in Austria, or Bildungsstaat and Abschluss not in Austria
-			// (or Abschluss not in Austria and Bildungsstaat unknown)
-			return ($in_oesterreich && $bildungsstaat == self::CODEX_OESTERREICH)
-				|| (!$in_oesterreich && ($bildungsstaat != self::CODEX_OESTERREICH || $bildungsstaat == self::CODEX_UNKNOWN_NATION));
+			// invalid if abschluss in Austria, but not Bildungsstaat, or abschluss not in Austria, but Bildungsstaat in Austria
+			return ($in_oesterreich && $bildungsstaat == self::CODEX_OESTERREICH) || (!$in_oesterreich && $bildungsstaat != self::CODEX_OESTERREICH);
 		}
 
 		return false;
@@ -372,11 +363,7 @@ class UHSTAT1 extends FHC_Controller
 
 		// get realistic birth years, dated back from current year
 		$currYear = date("Y");
-		$yearRange = range($currYear - self::UPPER_BOUNDARY_YEARS, $currYear - self::LOWER_BOUNDARY_YEARS);
-		$formMetaData['jahre'] = array_combine($yearRange, $yearRange);
-
-		// add "unknown" option
-		$formMetaData['jahre'][self::CODEX_UNKNOWN_YEAR] = 'unbekannt';
+		$formMetaData['jahre'] = range($currYear - self::UPPER_BOUNDARY_YEARS, $currYear - self::LOWER_BOUNDARY_YEARS);
 
 		return success($formMetaData);
 	}
@@ -424,10 +411,7 @@ class UHSTAT1 extends FHC_Controller
 	private function _getValidPersonId($berechtigungsArt)
 	{
 		// if coming from bewerbungstool - person id is in session (person must be logged in bewerbungstool)
-		if (isset($_SESSION[self::PERSON_ID_SESSION_INDEX])
-			&& is_numeric($_SESSION[self::PERSON_ID_SESSION_INDEX])
-			&& isset($_SESSION[self::LOGIN_SESSION_INDEX])
-		)
+		if (isset($_SESSION[self::PERSON_ID_SESSION_INDEX]) && is_numeric($_SESSION[self::PERSON_ID_SESSION_INDEX]))
 			return $_SESSION[self::PERSON_ID_SESSION_INDEX];
 
 		// if person id passed directly...

application/controllers/jobs/IssueResolver.php

@@ -9,8 +9,8 @@ class IssueResolver extends IssueResolver_Controller
 	{
 		parent::__construct();
 
-		// set fehler codes which can be resolved by the job, with own resolver defined
-		// structure: fehlercode => class (library) name for resolving in "resolvers" folder
+		// set fehler codes which can be resolved by the job
+		// structure: fehlercode => class (library) name for resolving
 		$this->_codeLibMappings = array(
 			'CORE_ZGV_0001' => 'CORE_ZGV_0001',
 			'CORE_ZGV_0002' => 'CORE_ZGV_0002',
@@ -30,6 +30,7 @@ class IssueResolver extends IssueResolver_Controller
 			'CORE_STG_0002' => 'CORE_STG_0002',
 			'CORE_STG_0003' => 'CORE_STG_0003',
 			'CORE_STG_0004' => 'CORE_STG_0004',
+			'CORE_STUDENTSTATUS_0001' => 'CORE_STUDENTSTATUS_0001',
 			'CORE_STUDENTSTATUS_0002' => 'CORE_STUDENTSTATUS_0002',
 			'CORE_STUDENTSTATUS_0003' => 'CORE_STUDENTSTATUS_0003',
 			'CORE_STUDENTSTATUS_0004' => 'CORE_STUDENTSTATUS_0004',
@@ -50,11 +51,5 @@ class IssueResolver extends IssueResolver_Controller
 			'CORE_PERSON_0003' => 'CORE_PERSON_0003',
 			'CORE_PERSON_0004' => 'CORE_PERSON_0004'
 		);
-
-		// fehler which are resolved by the job the same way as they are produced
-		// structure: fehlercode => class (library) name for resolving in "plausichecks" folder
-		$this->_codeProducerLibMappings = array(
-			'CORE_STUDENTSTATUS_0001' => 'AbbrecherAktiv',
-		);
 	}
 }

application/controllers/jobs/OneTimeMessages.php

@@ -51,7 +51,7 @@ class OneTimeMessages extends JOB_Controller
 			   FROM public.tbl_prestudent p
 			   JOIN public.tbl_prestudentstatus ps USING (prestudent_id)
  			   JOIN public.tbl_studiengang s USING (studiengang_kz)
-			  WHERE get_rolle_prestudent(ps.prestudent_id, NULL) = \'Wartender\'
+			  WHERE ps.status_kurzbz = \'Wartender\'
 			    AND ps.studiensemester_kurzbz = ?
 			    AND ps.datum <= NOW() - \''.$days.' days\'::interval
 			    AND s.typ = ?

application/controllers/lehre/Studierendenantrag.php

@@ -21,7 +21,6 @@ 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([
@@ -103,7 +102,6 @@ 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,
@@ -187,4 +185,4 @@ class Studierendenantrag extends FHC_Controller
 
 		return $strRequiredPermissions;
 	}
-}
+}

application/controllers/lehre/lvplanung/LvTemplateUebersicht.php

@@ -1,45 +0,0 @@
-<?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,13 +337,10 @@ class InfoCenter extends Auth_Controller
 		$persondata = $this->_loadPersonData($person_id);
 
 		$checkPerson = $this->PersonModel->checkDuplicate($person_id);
+
 		if (isError($checkPerson)) show_error(getError($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));
+		$duplicate = array('duplicated' => getData($checkPerson));
 
 		$prestudentdata = $this->_loadPrestudentData($person_id);
 
@@ -354,8 +351,7 @@ class InfoCenter extends Auth_Controller
 			$persondata,
 			$prestudentdata,
 			$dokumentdata,
-			$duplicate,
-			$unruly
+			$duplicate
 		);
 
 		$data[self::FHC_CONTROLLER_ID] = $this->getControllerId();
@@ -1289,28 +1285,67 @@ class InfoCenter extends Auth_Controller
 			$this->terminateWithJsonError($this->p->t('ui', 'fehlerBeimSpeichern'));
 
 		$kontakte = $this->input->post('kontakt');
-		if($kontakte) {
+		foreach ($kontakte as $kontakt)
+		{
+			$kontaktExists = $this->KontaktModel->loadWhere(array(
+				'kontakt_id' => $kontakt['id'],
+				'person_id' => $person_id,
+			));
 
-			foreach ($kontakte as $kontakt) {
-				$kontaktExists = $this->KontaktModel->loadWhere(array(
-					'kontakt_id' => $kontakt['id'],
-					'person_id' => $person_id,
-				));
+			if (hasData($kontaktExists))
+			{
+				$kontaktExists = getData($kontaktExists)[0];
 
-				if (hasData($kontaktExists)) {
-					$kontaktExists = getData($kontaktExists)[0];
+				if ($kontaktExists->kontakt === $kontakt['value'])
+					continue;
 
-					if ($kontaktExists->kontakt === $kontakt['value'])
-						continue;
+				$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
+					)
+				);
 
-					$update = $this->KontaktModel->update(
+				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(
 						array
 						(
-							'kontakt_id' => $kontakt['id']
+							'adresse_id' => $adresseExists->adresse_id
 						),
 						array
 						(
-							'kontakt' => isEmptyString($kontakt['value']) ? null : $kontakt['value'],
+							'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
 						)
@@ -1319,48 +1354,7 @@ 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'));
-					}
-
-				}
 			}
 		}
 
@@ -2389,4 +2383,4 @@ class InfoCenter extends Auth_Controller
 
 		$this->outputJsonSuccess("Success");
 	}
-}
+}

application/core/IssueResolver_Controller.php

@@ -5,18 +5,21 @@
  */
 abstract class IssueResolver_Controller extends JOB_Controller
 {
-	// mappings in form fehlercode -> resolverlibrary name, fehler which have explicit resolver class defined
-	protected $_codeLibMappings = [];
+	const CI_PATH = 'application';
+	const CI_LIBRARY_FOLDER = 'libraries';
+	const EXTENSIONS_FOLDER = 'extensions';
+	const ISSUE_RESOLVERS_FOLDER = 'issues/resolvers';
+	const CHECK_ISSUE_RESOLVED_METHOD_NAME = 'checkIfIssueIsResolved';
 
-	// mappings in form fehlercode -> producer library name, fehler which are resolved the same way they are produced
-	protected $_codeProducerLibMappings = [];
+	protected $_codeLibMappings;
 
 	public function __construct()
 	{
 		parent::__construct();
 
-		// pass extension name if calling from extension
 		$this->load->model('system/Issue_model', 'IssueModel');
+
+		$this->load->library('IssuesLib');
 	}
 
 	/**
@@ -24,29 +27,97 @@ abstract class IssueResolver_Controller extends JOB_Controller
 	 */
 	public function run()
 	{
-		$this->load->library(
-			'issues/PlausicheckResolverLib',
-			[
-				'extensionName' => $this->_extensionName ?? null,
-				'codeLibMappings' => $this->_codeLibMappings,
-				'codeProducerLibMappings' => $this->_codeProducerLibMappings
-			]
-		);
-
 		$this->logInfo("Issue resolve job started");
 
 		// load open issues with given errorcodes
-		$openIssuesRes = $this->IssueModel->getOpenIssues(
-			array_merge(array_keys($this->_codeLibMappings), array_keys($this->_codeProducerLibMappings))
-		);
+		$openIssuesRes = $this->IssueModel->getOpenIssues(array_keys($this->_codeLibMappings));
 
-		$openIssues = hasData($openIssuesRes) ? getData($openIssuesRes) : [];
+		// log error if occured
+		if (isError($openIssuesRes))
+		{
+			$this->logError(getError($openIssuesRes));
+		}
+		else
+		{
+			// log info if no data found
+			if (!hasData($openIssuesRes))
+			{
+				$this->logInfo("No open issues found");
+			}
+			else
+			{
+				$openIssues = getData($openIssuesRes);
 
-		$result = $this->plausicheckresolverlib->resolvePlausicheckIssues($openIssues);
+				foreach ($openIssues as $issue)
+				{
+					// ignore if Fehlercode is not in libmappings (shouldn't be checked)
+					if (!isset($this->_codeLibMappings[$issue->fehlercode])) continue;
 
-		// log if error, or log info if inserted new issue
-		foreach ($result->errors as $error) $this->logError($error);
-		foreach ($result->infos as $info) $this->logInfo($info);
+					$libName = $this->_codeLibMappings[$issue->fehlercode];
+
+					// add person id and oe kurzbz automatically as params, merge it with additional params
+					// decode bewerbung_parameter into assoc array
+					$params = array_merge(
+						array('issue_id' => $issue->issue_id, 'issue_person_id' => $issue->person_id, 'issue_oe_kurzbz' => $issue->oe_kurzbz),
+						isset($issue->behebung_parameter) ? json_decode($issue->behebung_parameter, true) : array()
+					);
+
+					// if called from extension (extension name set), path includes extension names
+					$libRootPath = isset($this->_extensionName) ? self::EXTENSIONS_FOLDER . '/' . $this->_extensionName . '/' : '';
+
+					// path for loading issue library
+					$issuesLibPath = $libRootPath . self::ISSUE_RESOLVERS_FOLDER . '/';
+
+					// file path of library for check if file exists
+					$issuesLibFilePath = DOC_ROOT . self::CI_PATH
+						. '/' . $libRootPath . self::CI_LIBRARY_FOLDER . '/' . self::ISSUE_RESOLVERS_FOLDER . '/' . $libName . '.php';
+
+					// check if library file exists
+					if (!file_exists($issuesLibFilePath))
+					{
+						// log error and continue with next issue if not
+						$this->logError("Issue library file " . $issuesLibFilePath . " does not exist");
+						continue;
+					}
+
+					// load library connected to fehlercode
+					$this->load->library($issuesLibPath . $libName);
+
+					$lowercaseLibName = mb_strtolower($libName);
+
+					// check if method is defined in library class
+					if (!is_callable(array($this->{$lowercaseLibName}, self::CHECK_ISSUE_RESOLVED_METHOD_NAME)))
+					{
+						// log error and continue with next issue if not
+						$this->logError("Method " . self::CHECK_ISSUE_RESOLVED_METHOD_NAME . " is not defined in library $lowercaseLibName");
+						continue;
+					}
+
+					// call the function for checking for issue resolution
+					$issueResolvedRes = $this->{$lowercaseLibName}->{self::CHECK_ISSUE_RESOLVED_METHOD_NAME}($params);
+
+					if (isError($issueResolvedRes))
+					{
+						$this->logError(getError($issueResolvedRes));
+					}
+					else
+					{
+						$issueResolvedData = getData($issueResolvedRes);
+
+						if ($issueResolvedData === true)
+						{
+							// set issue to resolved if needed
+							$behobenRes = $this->issueslib->setBehoben($issue->issue_id, null);
+
+							if (isError($behobenRes))
+								$this->logError(getError($behobenRes));
+							else
+								$this->logInfo("Issue " . $issue->issue_id . " successfully resolved");
+						}
+					}
+				}
+			}
+		}
 
 		$this->logInfo("Issue resolve job ended");
 	}

application/core/PlausiIssueProducer_Controller.php

@@ -5,23 +5,61 @@
  */
 abstract class PlausiIssueProducer_Controller extends JOB_Controller
 {
-	protected $_fehlerLibMappings = [];
+	protected $_fehlerLibMappings;
 	protected $_app;
 
+	public function __construct($app = null)
+	{
+		parent::__construct();
+
+		// pass extension name if calling from extension
+		$extensionName = isset($this->_extensionName) ? $this->_extensionName : null;
+
+		// load libraries
+		$this->load->library('issues/PlausicheckProducerLib', array('extensionName' => $extensionName, 'app' => $this->_app));
+		$this->load->library('IssuesLib');
+	}
+
 	protected function producePlausicheckIssues($params)
 	{
-		$this->load->library(
-			'issues/PlausicheckProducerLib',
-			['extensionName' => $this->_extensionName ?? null, 'app' => $this->_app, 'fehlerLibMappings' => $this->_fehlerLibMappings]
-		);
-
 		$this->logInfo("Plausicheck issue producer job started");
 
-		$result = $this->plausicheckproducerlib->producePlausicheckIssues($params);
+		// get the data returned by Plausicheck
+		foreach ($this->_fehlerLibMappings as $fehler_kurzbz => $libName)
+		{
+			// execute the check
+			$this->logInfo("Checking " . $fehler_kurzbz . "...");
+			$plausicheckRes = $this->plausicheckproducerlib->producePlausicheckIssue(
+				$libName,
+				$fehler_kurzbz,
+				$params
+			);
 
-		// log if error, or log info if inserted new issue
-		foreach ($result->errors as $error) $this->logError($error);
-		foreach ($result->infos as $info) $this->logInfo($info);
+			if (isError($plausicheckRes)) $this->logError(getError($plausicheckRes));
+
+			if (hasData($plausicheckRes))
+			{
+				$plausicheckData = getData($plausicheckRes);
+
+				foreach ($plausicheckData as $plausiData)
+				{
+					// get the data needed for issue production
+					$person_id = isset($plausiData['person_id']) ? $plausiData['person_id'] : null;
+					$oe_kurzbz = isset($plausiData['oe_kurzbz']) ? $plausiData['oe_kurzbz'] : null;
+					$fehlertext_params = isset($plausiData['fehlertext_params']) ? $plausiData['fehlertext_params'] : null;
+					$resolution_params = isset($plausiData['resolution_params']) ? $plausiData['resolution_params'] : null;
+
+					// write the issue
+					$addIssueRes = $this->issueslib->addFhcIssue($fehler_kurzbz, $person_id, $oe_kurzbz, $fehlertext_params, $resolution_params);
+
+					// log if error, or log info if inserted new issue
+					if (isError($addIssueRes))
+						$this->logError(getError($addIssueRes));
+					elseif (hasData($addIssueRes) && is_integer(getData($addIssueRes)))
+						$this->logInfo("Plausicheck issue " . $fehler_kurzbz . " successfully produced, person_id: " . $person_id);
+				}
+			}
+		}
 
 		$this->logInfo("Plausicheck issue producer job stopped");
 	}

application/libraries/AntragLib.php

@@ -930,7 +930,7 @@ class AntragLib
 	public function createWiederholung($prestudent_id, $studiensemester_kurzbz, $insertvon, $repeat)
 	{
 		$result = $this->_ci->StudierendenantragModel->loadIdAndStatusWhere([
-			'tbl_studierendenantrag.prestudent_id' => $prestudent_id,
+			'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([
-				'tbl_studierendenantrag.prestudent_id' => $prestudent_id,
+				'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([
-				'tbl_studierendenantrag.prestudent_id' => $prestudent_id,
+				'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(['tbl_studierendenantrag.prestudent_id' => $prestudent_id]);
+		$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere(['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(['tbl_studierendenantrag.prestudent_id' => $prestudent_id]);
+		$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere(['prestudent_id' => $prestudent_id]);
 		if (isError($result))
 			return $result;
 		if (!hasData($result))
@@ -1463,6 +1463,12 @@ 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)
@@ -1523,7 +1529,7 @@ class AntragLib
 		$datumStatus = $result->datum;
 		if (!in_array($result->status_kurzbz, $this->_ci->config->item('antrag_prestudentstatus_whitelist'))) {
 			$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere([
-				'tbl_studierendenantrag.prestudent_id' => $prestudent_id,
+				'prestudent_id' => $prestudent_id,
 				'typ' => Studierendenantrag_model::TYP_WIEDERHOLUNG,
 				's.studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_APPROVED
 			]);
@@ -1533,7 +1539,7 @@ class AntragLib
 				return success(-1);
 
 			$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere([
-				'tbl_studierendenantrag.prestudent_id' => $prestudent_id,
+				'prestudent_id' => $prestudent_id,
 				'typ' => Studierendenantrag_model::TYP_WIEDERHOLUNG,
 				's.studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_DEREGISTERED
 			]);
@@ -1543,7 +1549,7 @@ class AntragLib
 				return success(-1);
 
 			$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere([
-				'tbl_studierendenantrag.prestudent_id' => $prestudent_id,
+				'prestudent_id' => $prestudent_id,
 				'typ' => Studierendenantrag_model::TYP_WIEDERHOLUNG,
 				's.studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_PAUSE
 			]);
@@ -1554,7 +1560,7 @@ class AntragLib
 
 			return success(0);
 		}
-		$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere(['tbl_studierendenantrag.prestudent_id' => $prestudent_id]);
+		$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere(['prestudent_id' => $prestudent_id]);
 		if (isError($result))
 			return $result;
 		if (!hasData($result))
@@ -1607,7 +1613,7 @@ class AntragLib
 	public function getDetailsForLastAntrag($prestudent_id, $typ = null)
 	{
 		$where = [
-			'tbl_studierendenantrag.prestudent_id' => $prestudent_id
+			'prestudent_id' => $prestudent_id
 		];
 		$types = null;
 		if ($typ) {
@@ -2193,4 +2199,4 @@ class AntragLib
 		$result = $this->_ci->StudierendenantraglehrveranstaltungModel->getLvsForPrestudent($prestudent_id, $studiensemester_kurzbz);
 		return $result;
 	}
-}
+}

application/libraries/IssuesLib.php

@@ -246,27 +246,7 @@ class IssuesLib
 				$fehlertext = vsprintf($fehlertextVorlage, $fehlertext_params);
 			}
 
-			if (isset($resolution_params))
-			{
-				if (is_array($resolution_params))
-				{
-					foreach ($resolution_params as $resolution_key => $resolution_param)
-					{
-						if (!is_string($resolution_key))
-							return error("Invalid parameter for resolution, must be an associative array");
-					}
-				}
-				else
-					return error("Invalid parameters for resolution");
-			}
-
-			$openIssuesCountRes = $this->_ci->IssueModel->getOpenIssueCount(
-				$fehlercode,
-				$person_id,
-				$oe_kurzbz,
-				$fehlercode_extern,
-				$resolution_params
-			);
+			$openIssuesCountRes = $this->_ci->IssueModel->getOpenIssueCount($fehlercode, $person_id, $oe_kurzbz, $fehlercode_extern);
 
 			if (hasData($openIssuesCountRes))
 			{
@@ -276,6 +256,20 @@ class IssuesLib
 
 				if ($openIssueCount == 0)
 				{
+					if (isset($resolution_params))
+					{
+						if (is_array($resolution_params))
+						{
+							foreach ($resolution_params as $resolution_key => $resolution_param)
+							{
+								if (!is_string($resolution_key))
+									return error("Invalid parameter for resolution, must be an associative array");
+							}
+						}
+						else
+							return error("Invalid parameters for resolution");
+					}
+
 					// insert new issue
 					return $this->_ci->IssueModel->insert(
 						array(

application/libraries/PrestudentLib.php

@@ -254,7 +254,7 @@ class PrestudentLib
 
 			$studiengang = current(getData($res));
 			$prestudent_status = current($result);
-			if ($prestudent_status->status_kurzbz != Prestudentstatus_model::STATUS_UNTERBRECHER && $prestudent_status->ausbildungssemester + 1 < $studiengang->max_semester)
+			if($prestudent_status->ausbildungssemester + 1 < $studiengang->max_semester)
 				$ausbildungssemester_plus = 1;
 
 			if(!$result)
@@ -264,35 +264,6 @@ 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,6 +15,7 @@ class PlausicheckDefinitionLib
 		'AktSemesterNull' => 'AktSemesterNull',
 		'AktiverStudentOhneStatus' => 'AktiverStudentOhneStatus',
 		'AusbildungssemPrestudentUngleichAusbildungssemStatus' => 'AusbildungssemPrestudentUngleichAusbildungssemStatus',
+		'BewerberNichtZumRtAngetreten' => 'BewerberNichtZumRtAngetreten',
 		'DatumAbschlusspruefungFehlt' => 'DatumAbschlusspruefungFehlt',
 		'DatumSponsionFehlt' => 'DatumSponsionFehlt',
 		'DatumStudiensemesterFalscheReihenfolge' => 'DatumStudiensemesterFalscheReihenfolge',
@@ -35,7 +36,6 @@ class PlausicheckDefinitionLib
 		'StudentstatusNachAbbrecher' => 'StudentstatusNachAbbrecher',
 		'DualesStudiumOhneMarkierung' => 'DualesStudiumOhneMarkierung'
 		//'StudienplanUngueltig' => 'StudienplanUngueltig'
-		//'BewerberNichtZumRtAngetreten' => 'BewerberNichtZumRtAngetreten'
 	);
 
 	/**

application/libraries/issues/PlausicheckProducerLib.php

@@ -12,25 +12,18 @@ class PlausicheckProducerLib
 
 	private $_ci; // ci instance
 	private $_extensionName; // name of extension
-	private $_konfiguration = []; // configuration parameters
-	private $_fehlerLibMappings = []; // mappings of fehler and libraries for producing them
-	private $_isForResolutionCheck = false; // mappings of fehler and libraries for producing them
+	private $_konfiguration = array(); // configuration parameters
 
 	public function __construct($params = null)
 	{
 		// set extension name if called from extension
 		if (isset($params['extensionName'])) $this->_extensionName = $params['extensionName'];
-		if (isset($params['fehlerLibMappings'])) $this->_fehlerLibMappings = $params['fehlerLibMappings'];
-		if (isset($params['isForResolutionCheck'])) $this->_isForResolutionCheck = $params['isForResolutionCheck'];
 
 		// set application
 		$app = isset($params['app']) ? $params['app'] : null;
 
 		$this->_ci =& get_instance(); // get ci instance
 
-		// load libraries
-		$this->_ci->load->library('IssuesLib');
-
 		// load models
 		$this->_ci->load->model('system/Fehlerkonfiguration_model', 'FehlerkonfigurationModel');
 
@@ -48,52 +41,6 @@ class PlausicheckProducerLib
 		}
 	}
 
-	/**
-	 * Produces multiple plausicheck issues at once and saved them to db.
-	 * @param array $params passed to each plausicheck
-	 * @return result object with occured error and info
-	 */
-	public function producePlausicheckIssues($params)
-	{
-		$result = new StdClass();
-		$result->errors = [];
-		$result->infos = [];
-
-		foreach ($this->_fehlerLibMappings as $fehler_kurzbz => $libName)
-		{
-			$plausicheckRes = $this->producePlausicheckIssue(
-				$libName,
-				$fehler_kurzbz,
-				$params
-			);
-
-			if (hasData($plausicheckRes))
-			{
-				$plausicheckData = getData($plausicheckRes);
-
-				foreach ($plausicheckData as $plausiData)
-				{
-					// get the data needed for issue production
-					$person_id = isset($plausiData['person_id']) ? $plausiData['person_id'] : null;
-					$oe_kurzbz = isset($plausiData['oe_kurzbz']) ? $plausiData['oe_kurzbz'] : null;
-					$fehlertext_params = isset($plausiData['fehlertext_params']) ? $plausiData['fehlertext_params'] : null;
-					$resolution_params = isset($plausiData['resolution_params']) ? $plausiData['resolution_params'] : null;
-
-					// write the issue
-					$addIssueRes = $this->_ci->issueslib->addFhcIssue($fehler_kurzbz, $person_id, $oe_kurzbz, $fehlertext_params, $resolution_params);
-
-					// log if error, or log info if inserted new issue
-					if (isError($addIssueRes))
-						$result->errors[] = getError($addIssueRes);
-					elseif (hasData($addIssueRes) && is_integer(getData($addIssueRes)))
-						$result->infos[] = "Plausicheck issue " . $fehler_kurzbz . " successfully produced, person_id: " . $person_id;
-				}
-			}
-		}
-
-		return $result;
-	}
-
 	/**
 	 * Executes plausicheck using a given library, returns the result.
 	 * @param $libName string name of library producing the issue
@@ -119,10 +66,7 @@ class PlausicheckProducerLib
 		$config = isset($this->_konfiguration[$fehler_kurzbz]) ? $this->_konfiguration[$fehler_kurzbz] : null;
 
 		// load library connected to fehlercode
-		$this->_ci->load->library(
-			$issuesLibPath . $libName,
-			['configurationParams' => $config, 'isForResolutionCheck' => $this->_isForResolutionCheck]
-		);
+		$this->_ci->load->library($issuesLibPath . $libName, $config);
 
 		$lowercaseLibName = mb_strtolower($libName);
 

application/libraries/issues/PlausicheckResolverLib.php

@@ -1,136 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-class PlausicheckResolverLib
-{
-	const CI_PATH = 'application';
-	const CI_LIBRARY_FOLDER = 'libraries';
-	const EXTENSIONS_FOLDER = 'extensions';
-	const ISSUE_RESOLVERS_FOLDER = 'issues/resolvers';
-	const CHECK_ISSUE_RESOLVED_METHOD_NAME = 'checkIfIssueIsResolved';
-
-	private $_ci; // ci instance
-	private $_extensionName; // name of extension
-	private $_codeLibMappings = []; // mappings for issues which explicitly defined resolver
-	private $_codeProducerLibMappings = []; // mappings for issues which are resolved as produced
-
-	public function __construct($params = null)
-	{
-		// set extension name if called from extension
-		if (isset($params['extensionName'])) $this->_extensionName = $params['extensionName'];
-		if (isset($params['codeLibMappings'])) $this->_codeLibMappings = $params['codeLibMappings'];
-		if (isset($params['codeProducerLibMappings'])) $this->_codeProducerLibMappings = $params['codeProducerLibMappings'];
-
-		$this->_ci =& get_instance(); // get ci instance
-
-		$this->_ci->load->library('IssuesLib');
-		$this->_ci->load->library('issues/PlausicheckProducerLib', ['extensionName' => $this->_extensionName, 'isForResolutionCheck' => true]);
-	}
-
-	/**
-	 * Reseolves multiple plausicheck issues at once.
-	 * @param array $codeLibMappings contains fehler type to check and library responsible for check (fehlercode => libName)
-	 * @param array $openIssues passed issues to resolve
-	 * @return result object with occured error and info
-	 */
-	public function resolvePlausicheckIssues($openIssues)
-	{
-		$result = new StdClass();
-		$result->errors = [];
-		$result->infos = [];
-
-		foreach ($openIssues as $issue)
-		{
-			// add person id and oe kurzbz automatically as params, merge it with additional params
-			// decode bewerbung_parameter into assoc array
-			$params = array_merge(
-				array('issue_id' => $issue->issue_id, 'issue_person_id' => $issue->person_id, 'issue_oe_kurzbz' => $issue->oe_kurzbz),
-				isset($issue->behebung_parameter) ? json_decode($issue->behebung_parameter, true) : array()
-			);
-
-			$issueResolved = false;
-
-			// ignore if Fehlercode is not in libmappings (shouldn't be checked)
-			if (isset($this->_codeLibMappings[$issue->fehlercode]))
-			{
-				$libName = $this->_codeLibMappings[$issue->fehlercode];
-
-				// if called from extension (extension name set), path includes extension names
-				$libRootPath = isset($this->_extensionName) ? self::EXTENSIONS_FOLDER . '/' . $this->_extensionName . '/' : '';
-
-				// path for loading issue library
-				$issuesLibPath = $libRootPath . self::ISSUE_RESOLVERS_FOLDER . '/';
-
-				// file path of library for check if file exists
-				$issuesLibFilePath = DOC_ROOT . self::CI_PATH
-					. '/' . $libRootPath . self::CI_LIBRARY_FOLDER . '/' . self::ISSUE_RESOLVERS_FOLDER . '/' . $libName . '.php';
-
-				// check if library file exists
-				if (!file_exists($issuesLibFilePath))
-				{
-					// log error and continue with next issue if not
-					$result->errors[] = "Issue library file " . $issuesLibFilePath . " does not exist";
-					continue;
-				}
-
-				// load library connected to fehlercode
-				$this->_ci->load->library($issuesLibPath . $libName);
-
-				$lowercaseLibName = mb_strtolower($libName);
-
-				// check if method is defined in library class
-				if (!is_callable(array($this->_ci->{$lowercaseLibName}, self::CHECK_ISSUE_RESOLVED_METHOD_NAME)))
-				{
-					// log error and continue with next issue if not
-					$result->errors[] = "Method " . self::CHECK_ISSUE_RESOLVED_METHOD_NAME . " is not defined in library $lowercaseLibName";
-					continue;
-				}
-
-				// call the function for checking for issue resolution
-				$issueResolvedRes = $this->_ci->{$lowercaseLibName}->{self::CHECK_ISSUE_RESOLVED_METHOD_NAME}($params);
-
-				if (isError($issueResolvedRes))
-				{
-					$result->errors[] = getError($issueResolvedRes);
-				}
-				else
-				{
-					$issueResolved = getData($issueResolvedRes) === true;
-				}
-			}
-			elseif (isset($this->_codeProducerLibMappings[$issue->fehlercode]))
-			{
-				$libName = $this->_codeProducerLibMappings[$issue->fehlercode];
-
-				$issueResolvedRes = $this->_ci->plausicheckproducerlib->producePlausicheckIssue(
-					$libName,
-					$issue->fehler_kurzbz,
-					$params
-				);
-
-				if (isError($issueResolvedRes))
-				{
-					$result->errors[] = getError($issueResolvedRes);
-				}
-				else
-				{
-					$issueResolved = !hasData($issueResolvedRes);
-				}
-			}
-
-			// set issue to resolved if needed
-			if ($issueResolved)
-			{
-				$behobenRes = $this->_ci->issueslib->setBehoben($issue->issue_id, null);
-
-				if (isError($behobenRes))
-					$result->errors[] = getError($behobenRes);
-				else
-					$result->infos[] = "Issue " . $issue->issue_id . " successfully resolved";
-			}
-		}
-
-		return $result;
-	}
-}

application/libraries/issues/plausichecks/AbbrecherAktiv.php

@@ -9,21 +9,83 @@ require_once('PlausiChecker.php');
  */
 class AbbrecherAktiv extends PlausiChecker
 {
-	protected $_base_sql = "
-		SELECT
-			pre.person_id, pre.prestudent_id, stg.oe_kurzbz AS prestudent_stg_oe_kurzbz
-		FROM
-			public.tbl_prestudentstatus pre_status
-			JOIN public.tbl_prestudent pre USING(prestudent_id)
-			JOIN public.tbl_student student USING(prestudent_id)
-			JOIN public.tbl_benutzer benutzer on(benutzer.uid=student.student_uid)
-			JOIN public.tbl_studiengang stg ON pre.studiengang_kz = stg.studiengang_kz
-		WHERE
-			pre_status.status_kurzbz ='Abbrecher'
-			AND benutzer.aktiv=true";
+	public function executePlausiCheck($params)
+	{
+		$results = array();
 
-	protected $_config_params = ['exkludierteStudiengaenge' => " AND stg.studiengang_kz NOT IN ?"];
-	protected $_params_for_checking = ['studiengang_kz' => " AND stg.studiengang_kz = ?", 'prestudent_id' => " AND pre.prestudent_id = ?"];
-	protected $_fehlertext_params = ['prestudent_id'];
-	protected $_resolution_params = ['prestudent_id'];
+		// get parameters from config
+		$exkludierte_studiengang_kz = isset($this->_config['exkludierteStudiengaenge']) ? $this->_config['exkludierteStudiengaenge'] : null;
+
+		// pass parameters needed for plausicheck
+		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
+
+		// get all students failing the plausicheck
+		$prestudentRes = $this->getAbbrecherAktiv($studiengang_kz, null, $exkludierte_studiengang_kz);
+
+		if (isError($prestudentRes)) return $prestudentRes;
+
+		if (hasData($prestudentRes))
+		{
+			$prestudents = getData($prestudentRes);
+
+			// populate results with data necessary for writing issues
+			foreach ($prestudents as $prestudent)
+			{
+				$results[] = array(
+					'person_id' => $prestudent->person_id,
+					'oe_kurzbz' => $prestudent->prestudent_stg_oe_kurzbz,
+					'fehlertext_params' => array('prestudent_id' => $prestudent->prestudent_id),
+					'resolution_params' => array('prestudent_id' => $prestudent->prestudent_id)
+				);
+			}
+		}
+
+		// return the results
+		return success($results);
+	}
+
+	/**
+	 * Abbrecher cannot be active.
+	 * @param studiengang_kz int if check is to be executed for certain Studiengang
+	 * @param prestudent_id int if check is to be executed only for one prestudent
+	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
+	 * @return success with prestudents or error
+	 */
+	public function getAbbrecherAktiv($studiengang_kz = null, $prestudent_id = null, $exkludierte_studiengang_kz = null)
+	{
+		$params = array();
+
+		$qry = "
+			SELECT
+				pre.person_id, pre.prestudent_id, stg.oe_kurzbz AS prestudent_stg_oe_kurzbz
+			FROM
+				public.tbl_prestudentstatus pre_status
+				JOIN public.tbl_prestudent pre USING(prestudent_id)
+				JOIN public.tbl_student student USING(prestudent_id)
+				JOIN public.tbl_benutzer benutzer on(benutzer.uid=student.student_uid)
+				JOIN public.tbl_studiengang stg ON pre.studiengang_kz = stg.studiengang_kz
+			WHERE
+				pre_status.status_kurzbz ='Abbrecher'
+				AND benutzer.aktiv=true";
+
+		if (isset($studiengang_kz))
+		{
+			$qry .= " AND stg.studiengang_kz = ?";
+			$params[] = $studiengang_kz;
+		}
+
+		if (isset($prestudent_id))
+		{
+			$qry .= " AND pre.prestudent_id = ?";
+			$params[] = $prestudent_id;
+		}
+
+		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
+		{
+			$qry .= " AND stg.studiengang_kz NOT IN ?";
+			$params[] = $exkludierte_studiengang_kz;
+		}
+
+		return $this->_db->execReadOnlyQuery($qry, $params);
+	}
 }

application/libraries/issues/plausichecks/PlausiChecker.php

@@ -6,25 +6,15 @@
 abstract class PlausiChecker
 {
 	protected $_ci; // code igniter instance
-	protected $_config; // all applicable configuration parameters for this plausicheck
+	protected $_config; // configuration parameters for this plausicheck
 	protected $_db; // database for queries
 
-	protected $_isForResolutionCheck; // if true, additional parameters only needed for resolution are checked
-
-	protected $_config_params = []; // name of all config params which should be applied for this plausicheck, with sql [name] => [sql]
-	protected $_params_for_checking = []; // name of all passed params for checking, with sql [name] => [sql]
-
-	protected $_fehlertext_params = []; // parameter names for fehlertext params used for this plausicheck
-	protected $_resolution_params = []; // parameter names for resolution params used for this plausicheck
-
-	public function __construct($params = null)
+	public function __construct($configurationParams = null)
 	{
 		$this->_ci =& get_instance(); // get code igniter instance
 
 		// set configuration
-		$this->_config = $params['configurationParams'] ?? [];
-
-		$this->_isForResolutionCheck = $params['isForResolutionCheck'] ?? false;
+		$this->_config = $configurationParams;
 
 		// get database for queries
 		$this->_db = new DB_Model();
@@ -35,83 +25,5 @@ abstract class PlausiChecker
 	 * @param $paramsForChecking array parameters needed for executing the check
 	 * @return array with objects which failed the plausi check
 	 */
-	public function executePlausiCheck($paramsForChecking)
-	{
-		$results = [];
-		$params = [];
-		$qry = $this->_base_sql;
-
-		if ($this->_isForResolutionCheck == true)
-		{
-			foreach ($this->_resolution_params as $resParam)
-			{
-				if (!isset($paramsForChecking[$resParam]))
-					return error("$resParam missing".(isset($paramsForChecking['issue_id']) ? ", issue ID: ".$paramsForChecking['issue_id'] : ""));
-			}
-		}
-
-		// add config params to query
-		if (isset($this->_config_params) && !isEmptyArray($this->_config_params))
-		{
-			foreach ($this->_config_params as $param_name => $param_sql)
-			{
-				if (isset($this->_config[$param_name]))
-				{
-					$qry .= $param_sql;
-					$params[] = $this->_config[$param_name];
-				}
-			}
-		}
-
-		// add check params to query
-		if (isset($this->_params_for_checking) && !isEmptyArray($this->_params_for_checking))
-		{
-			foreach ($this->_params_for_checking as $param_name => $param_sql)
-			{
-				if (isset($paramsForChecking[$param_name]))
-				{
-					$qry .= $param_sql;
-					$params[] = $paramsForChecking[$param_name];
-				}
-			}
-		}
-
-		$result = $this->_db->execReadOnlyQuery($qry, $params);
-
-		if (isError($result)) return $result;
-
-		if (hasData($result))
-		{
-			$data = getData($result);
-
-			// populate results with data necessary for writing issues
-			foreach ($data as $d)
-			{
-				$fehlertext_params = [];
-				$resolution_params = [];
-
-				// add params for error texts
-				foreach ($this->_fehlertext_params as $param)
-				{
-					if (isset($d->{$param})) $fehlertext_params[$param] = $d->{$param};
-				}
-
-				// add params for resolution of issue
-				foreach ($this->_resolution_params as $param)
-				{
-					if (isset($d->{$param})) $resolution_params[$param] = $d->{$param};
-				}
-
-				$results[] = array(
-					'person_id' => $d->person_id,
-					'oe_kurzbz' => $d->prestudent_stg_oe_kurzbz,
-					'fehlertext_params' => $fehlertext_params,
-					'resolution_params' => $resolution_params
-				);
-			}
-		}
-
-		// return the results
-		return success($results);
-	}
+	abstract public function executePlausiCheck($paramsForChecking);
 }

application/models/codex/Bismeldestichtag_model.php

@@ -33,23 +33,6 @@ 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,7 +289,6 @@ 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');
@@ -572,12 +571,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');
@@ -588,4 +587,4 @@ class Prestudentstatus_model extends DB_Model
 			'status_kurzbz' => self::STATUS_BEWERBER
 		]);
 	}
-}
+}

application/models/education/Lvgesamtnote_model.php

@@ -10,6 +10,5 @@ class Lvgesamtnote_model extends DB_Model
 		parent::__construct();
 		$this->dbTable = 'campus.tbl_lvgesamtnote';
 		$this->pk = array('student_uid', 'studiensemester_kurzbz', 'lehrveranstaltung_id');
-		$this->hasSequence = false;
 	}
 }

application/models/education/Paabgabe_model.php

@@ -25,7 +25,7 @@ class Paabgabe_model extends DB_Model
 				WHERE projektarbeit_id = ?
 				AND paabgabetyp_kurzbz = 'end'
 				AND paabg.abgabedatum IS NOT NULL
-				ORDER BY paabg.abgabedatum DESC, paabg.datum DESC
+				ORDER BY paabg.abgabedatum, paabg.datum DESC
 				LIMIT 1";
 
 		return $this->execQuery($qry, array($projektarbeit_id));

application/models/education/Pruefung_model.php

@@ -175,8 +175,6 @@ 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,7 +38,6 @@ 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');
@@ -97,8 +96,7 @@ 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_REMINDERSENT
+			Studierendenantragstatus_model::STATUS_PAUSE
 		]);
 		$this->db->or_group_start();
 		$this->db->where('s.studierendenantrag_statustyp_kurzbz', Studierendenantragstatus_model::STATUS_APPROVED);
@@ -150,7 +148,6 @@ 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->addJoin(
 			'campus.tbl_studierendenantrag_status s',
@@ -160,18 +157,6 @@ 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);
@@ -369,7 +354,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) NOT IN (\'' . Studierendenantragstatus_model::STATUS_CANCELLED . '\', \'' . Studierendenantragstatus_model::STATUS_REJECTED . '\')' => null,
+			'campus.get_status_studierendenantrag(studierendenantrag_id) !=' => Studierendenantragstatus_model::STATUS_CANCELLED,
 			'start < ' . $end => null,
 			'datum_wiedereinstieg > ' . $start => null,
 		]);
@@ -425,7 +410,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) NOT IN ?
+			AND campus.get_status_studierendenantrag(studierendenantrag_id) != ?
 			AND prestudent_id=?
 		) a ON (s.start < a.ende AND s.ende > a.start)
 		WHERE s.start >= (" . $subquery . ")
@@ -435,10 +420,7 @@ class Studierendenantrag_model extends DB_Model
 		return $this->execQuery($sql, [
 			$max_length,
 			self::TYP_UNTERBRECHUNG,
-			array(
-			    Studierendenantragstatus_model::STATUS_CANCELLED,
-			    Studierendenantragstatus_model::STATUS_REJECTED
-			),
+			Studierendenantragstatus_model::STATUS_CANCELLED,
 			$prestudent_id,
 			$studiensemester ?: $prestudent_id,
 			$max_length * $max_starters
@@ -489,4 +471,4 @@ class Studierendenantrag_model extends DB_Model
 		
 		return hasData($this->load());
 	}
-}
+}

application/models/organisation/Geschaeftsjahr_model.php

@@ -32,20 +32,11 @@ class Geschaeftsjahr_model extends DB_Model
 	 * Gets next Geschaeftsjahr, as determined by its start date
 	 * @return array|null
 	 */
-	public function getNextGeschaeftsjahr($offsetDays=null)
+	public function getNextGeschaeftsjahr()
 	{
 		$query = 'SELECT *
-					FROM public.tbl_geschaeftsjahr WHERE ';
-
-		if(!is_null($offsetDays))
-		{
-			$query .= "start > now() - '".$offsetDays." days'::interval";
-		}
-		else
-		{
-			$query .= 'start > now()';
-		}
-		$query .= '
+					FROM public.tbl_geschaeftsjahr
+					WHERE start > now()
 					ORDER BY start
 					LIMIT 1';
 

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,38 +374,5 @@ 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/models/system/Issue_model.php

@@ -22,23 +22,13 @@ class Issue_model extends DB_Model
 	 */
 	public function getOpenIssues($fehlercodes, $person_id = null, $oe_kurzbz = null, $fehlercode_extern = null)
 	{
-		$params = array();
+		$params = array($fehlercodes);
 		// issue exists for a fehlercode (or fehlercode_extern), person_id, oe_kurzbz, if not verarbeitet yet
-		$qry = 'SELECT
-					iss.issue_id, iss.fehlercode, fe.fehler_kurzbz, iss.inhalt, iss.fehlercode_extern,
-					iss.inhalt_extern, iss.person_id, iss.oe_kurzbz, iss.behebung_parameter,
-					iss.datum, iss.verarbeitetvon, iss.verarbeitetamum
-				FROM
-					system.tbl_issue iss
-					JOIN system.tbl_fehler fe USING (fehlercode)
-				WHERE
-					verarbeitetamum IS NULL';
-
-		if (!isEmptyArray($fehlercodes))
-		{
-			$qry .= ' AND fehlercode IN ?';
-			$params[] = $fehlercodes;
-		}
+		$qry = 'SELECT issue_id, fehlercode, inhalt, fehlercode_extern, inhalt_extern, person_id, oe_kurzbz,
+       					behebung_parameter, datum, verarbeitetvon, verarbeitetamum
+				FROM system.tbl_issue
+				WHERE fehlercode IN ?
+				AND verarbeitetamum IS NULL';
 
 		if (!isEmptyString($fehlercode_extern))
 		{
@@ -69,7 +59,7 @@ class Issue_model extends DB_Model
 	 * @param string $fehlercode_extern if provided, only issues with this external fehlercode are counted (for identifying issues from external systems).
 	 * @return Object success with number of issues or error
 	 */
-	public function getOpenIssueCount($fehlercode, $person_id = null, $oe_kurzbz = null, $fehlercode_extern = null, $behebung_parameter = null)
+	public function getOpenIssueCount($fehlercode, $person_id = null, $oe_kurzbz = null, $fehlercode_extern = null)
 	{
 		$params = array($fehlercode);
 		// issue exists for a fehlercode (or fehlercode_extern), person_id, oe_kurzbz, if not verarbeitet yet
@@ -95,19 +85,6 @@ class Issue_model extends DB_Model
 			$params[] = $oe_kurzbz;
 		}
 
-		if (isset($behebung_parameter) && !isEmptyArray($behebung_parameter))
-		{
-			// convert array to JSON string for postgres
-			$behebung_parameter_string = json_encode($behebung_parameter);
-
-			if ($behebung_parameter_string)
-			{
-				// check if jsonb value is equal to the passed parameters array (if value contains array and array contains value)
-				$qry .= ' AND behebung_parameter @> ? AND behebung_parameter <@ ?';
-				$params = array_merge($params, array($behebung_parameter_string, $behebung_parameter_string));
-			}
-		}
-
 		return $this->execQuery($qry, $params);
 	}
 }

application/models/system/Recipient_model.php

@@ -327,7 +327,7 @@ class Recipient_model extends DB_Model
 						pr.nachname,
 						ms.person_id,
 						mrou.token
-			  ORDER BY sent DESC LIMIT 1500';
+			  ORDER BY sent DESC';
 
 		return $this->execQuery($sql, array($person_id, $functions, $person_id));
 	}

application/models/vertragsbestandteil/GehaltsTyp_model.php

@@ -1,28 +0,0 @@
-<?php
-
-class GehaltsTyp_model extends DB_Model
-{
-
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'hr.tbl_gehaltstyp';
-		$this->pk = 'gehaltstyp_kurzbz';
-	}
-
-	/**
-	 * Gets Gehaltstyp for a Gehaltsbestandteil.
-	 * @param int gehaltsbestandteil_id
-	 * @return object the typ
-	 */
-	public function getGehaltstypByGehaltsbestandteil($gehaltsbestandteil_id)
-	{
-		$gehaltsTyp = null;
-		$this->addJoin('hr.tbl_gehaltsbestandteil', 'gehaltstyp_kurzbz');
-		$result = $this->loadWhere(['gehaltsbestandteil_id' => $gehaltsbestandteil_id]);
-
-		if (hasData($result)) $gehaltsTyp = getData($result)[0];
-
-		return $gehaltsTyp;
-	}
-}

application/views/codex/uhstat1.php

@@ -74,23 +74,16 @@ $saved = isset($saved) && $saved === true;
 				<div class="form-group">
 					<label for="mutter_geburtsjahr" class="col-sm-3 control-label"><?php echo ucfirst($this->p->t('uhstat', 'geburtsjahr')) ?></label>
 					<div class="col-sm-9">
-						<div class="input-group">
-							<select type="text" name="mutter_geburtsjahr" id="mutter_geburtsjahr" class="form-control" <?php echo $disabled ?>>
-								<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
-								<?php foreach ($formMetaData['jahre'] as $jahrKey => $jahr): ?>
-									<option
-										value="<?php echo $jahrKey ?>"
-										<?php echo $jahrKey == $mutter_geburtsjahr ? " selected" : "" ?>>
-										<?php echo $jahr ?>
-									</option>
-								<?php endforeach; ?>
-							</select>
-							<span class="input-group-btn">
-								<button type="button" class="btn btn-default" onclick="document.getElementById('mutter_geburtsjahr').value = 9999; return false;" <?php echo $disabled ?>>
-									<?php echo $this->p->t('uhstat', 'unbekannt') ?>
-								</button>
-							</span>
-						</div>
+						<select type="text" name="mutter_geburtsjahr" id="mutter_geburtsjahr" class="form-control" <?php echo $disabled ?>>
+							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
+							<?php foreach ($formMetaData['jahre'] as $jahr): ?>
+								<option
+									value="<?php echo $jahr ?>"
+									<?php echo $jahr == $mutter_geburtsjahr ? " selected" : "" ?>>
+									<?php echo $jahr ?>
+								</option>
+							<?php endforeach; ?>
+						</select>
 						<?php echo form_error('mutter_geburtsjahr'); ?>
 					</div>
 				</div>
@@ -101,23 +94,16 @@ $saved = isset($saved) && $saved === true;
 						<?php echo '('.ucfirst($this->p->t('uhstat', 'inDenHeutigenGrenzen')).')' ?>
 					</label>
 					<div class="col-sm-9">
-						<div class="input-group">
-							<select type="text" name="mutter_geburtsstaat" id="mutter_geburtsstaat" class="form-control" <?php echo $disabled ?>>
-								<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
-								<?php foreach ($formMetaData['nation'] as $nation): ?>
-									<option
-										value="<?php echo $nation->nation_code ?>"
-										<?php echo $mutter_geburtsstaat == $nation->nation_code ? " selected" : "" ?>>
-										<?php echo $nation->nation_text ?>
-									</option>
-								<?php endforeach; ?>
-							</select>
-							<span class="input-group-btn">
-								<button type="button" class="btn btn-default" onclick="document.getElementById('mutter_geburtsstaat').value = 'XXX'; return false;" <?php echo $disabled ?>>
-									<?php echo $this->p->t('uhstat', 'unbekannt') ?>
-								</button>
-							</span>
-						</div>
+						<select type="text" name="mutter_geburtsstaat" id="mutter_geburtsstaat" class="form-control" <?php echo $disabled ?>>
+							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
+							<?php foreach ($formMetaData['nation'] as $nation): ?>
+								<option
+									value="<?php echo $nation->nation_code ?>"
+									<?php echo $mutter_geburtsstaat == $nation->nation_code ? " selected" : "" ?>>
+									<?php echo $nation->nation_text ?>
+								</option>
+							<?php endforeach; ?>
+						</select>
 						<?php echo form_error('mutter_geburtsstaat'); ?>
 					</div>
 				</div>
@@ -128,23 +114,16 @@ $saved = isset($saved) && $saved === true;
 						<?php echo '('.ucfirst($this->p->t('uhstat', 'inDenHeutigenGrenzen')).')' ?>
 					</label>
 					<div class="col-sm-9">
-						<div class="input-group">
-							<select type="text" name="mutter_bildungsstaat" id="mutter_bildungsstaat" class="form-control" <?php echo $disabled ?>>
-								<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
-								<?php foreach ($formMetaData['nation'] as $nation): ?>
-									<option
-										value="<?php echo $nation->nation_code ?>"
-										<?php echo $mutter_bildungsstaat == $nation->nation_code ? " selected" : "" ?>>
-										<?php echo $nation->nation_text ?>
-									</option>
-								<?php endforeach; ?>
-							</select>
-							<span class="input-group-btn">
-								<button type="button" class="btn btn-default" onclick="document.getElementById('mutter_bildungsstaat').value = 'XXX'; return false;" <?php echo $disabled ?>>
-									<?php echo $this->p->t('uhstat', 'unbekannt') ?>
-								</button>
-							</span>
-						</div>
+						<select type="text" name="mutter_bildungsstaat" id="mutter_bildungsstaat" class="form-control" <?php echo $disabled ?>>
+							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
+							<?php foreach ($formMetaData['nation'] as $nation): ?>
+								<option
+									value="<?php echo $nation->nation_code ?>"
+									<?php echo $mutter_bildungsstaat == $nation->nation_code ? " selected" : "" ?>>
+									<?php echo $nation->nation_text ?>
+								</option>
+							<?php endforeach; ?>
+						</select>
 						<?php echo form_error('mutter_bildungsstaat'); ?>
 					</div>
 				</div>
@@ -182,23 +161,16 @@ $saved = isset($saved) && $saved === true;
 				<div class="form-group">
 					<label for="vater_geburtsjahr" class="col-sm-3 control-label"><?php echo ucfirst($this->p->t('uhstat', 'geburtsjahr')) ?></label>
 					<div class="col-sm-9">
-						<div class="input-group">
-							<select type="text" name="vater_geburtsjahr" id="vater_geburtsjahr" class="form-control" <?php echo $disabled ?>>
-								<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
-								<?php foreach ($formMetaData['jahre'] as $jahrKey => $jahr): ?>
-									<option
-										value="<?php echo $jahrKey ?>"
-										<?php echo $vater_geburtsjahr == $jahrKey ? " selected" : "" ?>>
+						<select type="text" name="vater_geburtsjahr" id="vater_geburtsjahr" class="form-control" <?php echo $disabled ?>>
+							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
+							<?php foreach ($formMetaData['jahre'] as $jahr): ?>
+								<option
+									value="<?php echo $jahr ?>"
+									<?php echo $vater_geburtsjahr == $jahr ? " selected" : "" ?>>
 										<?php echo $jahr ?>
 									</option>
-								<?php endforeach; ?>
-							</select>
-							<span class="input-group-btn">
-								<button type="button" class="btn btn-default" onclick="document.getElementById('vater_geburtsjahr').value = 9999; return false;" <?php echo $disabled ?>>
-									<?php echo $this->p->t('uhstat', 'unbekannt') ?>
-								</button>
-							</span>
-						</div>
+							<?php endforeach; ?>
+						</select>
 						<?php echo form_error('vater_geburtsjahr'); ?>
 					</div>
 				</div>
@@ -209,23 +181,16 @@ $saved = isset($saved) && $saved === true;
 						<?php echo '('.ucfirst($this->p->t('uhstat', 'inDenHeutigenGrenzen')).')' ?>
 					</label>
 					<div class="col-sm-9">
-						<div class="input-group">
-							<select type="text" name="vater_geburtsstaat" id="vater_geburtsstaat" class="form-control" <?php echo $disabled ?>>
-								<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
-								<?php foreach ($formMetaData['nation'] as $nation): ?>
-									<option
-										value="<?php echo $nation->nation_code ?>"
-										<?php echo $vater_geburtsstaat == $nation->nation_code ? " selected" : "" ?>>
-											<?php echo $nation->nation_text ?>
-									</option>
-								<?php endforeach; ?>
-							</select>
-							<span class="input-group-btn">
-								<button type="button" class="btn btn-default" onclick="document.getElementById('vater_geburtsstaat').value = 'XXX'; return false;" <?php echo $disabled ?>>
-									<?php echo $this->p->t('uhstat', 'unbekannt') ?>
-								</button>
-							</span>
-						</div>
+						<select type="text" name="vater_geburtsstaat" id="vater_geburtsstaat" class="form-control" <?php echo $disabled ?>>
+							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
+							<?php foreach ($formMetaData['nation'] as $nation): ?>
+								<option
+									value="<?php echo $nation->nation_code ?>"
+									<?php echo $vater_geburtsstaat == $nation->nation_code ? " selected" : "" ?>>
+										<?php echo $nation->nation_text ?>
+								</option>
+							<?php endforeach; ?>
+						</select>
 						<?php echo form_error('vater_geburtsstaat'); ?>
 					</div>
 				</div>
@@ -236,23 +201,16 @@ $saved = isset($saved) && $saved === true;
 						<?php echo '('.ucfirst($this->p->t('uhstat', 'inDenHeutigenGrenzen')).')' ?>
 					</label>
 					<div class="col-sm-9">
-						<div class="input-group">
-							<select type="text" name="vater_bildungsstaat" id="vater_bildungsstaat" class="form-control" <?php echo $disabled ?>>
-								<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
-								<?php foreach ($formMetaData['nation'] as $nation): ?>
-									<option
-										value="<?php echo $nation->nation_code ?>"
-										<?php echo $vater_bildungsstaat == $nation->nation_code ? " selected" : "" ?>>
-											<?php echo $nation->nation_text ?>
-									</option>
-								<?php endforeach; ?>
-							</select>
-							<span class="input-group-btn">
-								<button type="button" class="btn btn-default" onclick="document.getElementById('vater_bildungsstaat').value = 'XXX'; return false;" <?php echo $disabled ?>>
-									<?php echo $this->p->t('uhstat', 'unbekannt') ?>
-								</button>
-							</span>
-						</div>
+						<select type="text" name="vater_bildungsstaat" id="vater_bildungsstaat" class="form-control" <?php echo $disabled ?>>
+							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
+							<?php foreach ($formMetaData['nation'] as $nation): ?>
+								<option
+									value="<?php echo $nation->nation_code ?>"
+									<?php echo $vater_bildungsstaat == $nation->nation_code ? " selected" : "" ?>>
+										<?php echo $nation->nation_text ?>
+								</option>
+							<?php endforeach; ?>
+						</select>
 						<?php echo form_error('vater_bildungsstaat'); ?>
 					</div>
 				</div>
@@ -313,7 +271,7 @@ $saved = isset($saved) && $saved === true;
 				</div>
 			</form>
 		<?php endif; ?>
-	</div> <!-- subcontainer -->
-</div> <!-- container -->
+	</div>
+</div>
 
 <?php $this->load->view('templates/FHC-Footer'); ?>

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

@@ -1,29 +0,0 @@
-<?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,8 +27,7 @@
 			'public/js/infocenter/rueckstellung.js',
 			'public/js/infocenter/zgvUeberpruefung.js',
 			'public/js/infocenter/docUeberpruefung.js',
-			'public/js/infocenter/stammdaten.js',
-			'public/js/infocenter/personcheck.js'
+			'public/js/infocenter/stammdaten.js'
 		),
 		'phrases' => array(
 			'infocenter',
@@ -39,14 +38,6 @@
 
 	$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'); ?>
@@ -83,8 +74,22 @@
 						</div>
 					</div>
 				</div>
-				<br/>
-					<?php $this->load->view('system/infocenter/personCheck.php', array('unruly' => $unruly, 'duplicate' => $duplicate)); ?>
+				<?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/>
 				<section>
 					<div class="row">
@@ -196,4 +201,5 @@
 	</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

@@ -1,34 +0,0 @@
-
-<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>

cis/private/tools/zeitaufzeichnung.php

@@ -1014,9 +1014,9 @@ if ($projekt->getProjekteMitarbeiter($user, true))
 		}
 
 		echo "	<a href='".$_SERVER['PHP_SELF']."?projektübersichtexport=1".($passuid ? '&uid='.$user : '')."' style='font-size: larger;'>Projektübersichtexport</a>";
-		//if($anzprojekte > 0)
-		echo "<a style='font-size: larger; text-decoration: none; cursor: default'> | </a><a href='".$_SERVER['PHP_SELF']."?projektexport=1".($passuid ? '&uid='.$user : '')."' style='font-size: larger;'>".$p->t("zeitaufzeichnung/projektexport")."</a>";
-		echo "</td>
+		      			if($anzprojekte > 0)
+		      				echo "<a style='font-size: larger; text-decoration: none; cursor: default'> | </a><a href='".$_SERVER['PHP_SELF']."?projektexport=1".($passuid ? '&uid='.$user : '')."' style='font-size: larger;'>".$p->t("zeitaufzeichnung/projektexport")."</a>";
+				echo "</td>
 		      		<td class='menubox' height='10px'>";
 		if ($p->t("dms_link/handbuchZeitaufzeichnung")!='')
 		{

include/lehrveranstaltung.class.php

@@ -2861,34 +2861,5 @@ class lehrveranstaltung extends basis_db
 			return false;
 		}
 	}
-
-	/**
-	 * Lädt alle vorhandenen Templates und gibt Id und Label ("bezeichnung [kurzbz]") zurück
-	 *
-	 * @return array
-	 */
-	public function loadAllTemplates()
-	{
-		$qry = "SELECT
-					tbl_lehrveranstaltung.lehrveranstaltung_id as id, CONCAT(tbl_lehrveranstaltung.bezeichnung, ' [', tbl_lehrveranstaltung.kurzbz, ']') as label
-				FROM
-					lehre.tbl_lehrveranstaltung
-				WHERE
-					tbl_lehrveranstaltung.lehrtyp_kurzbz = 'tpl'
-			";
-		if($this->db_query($qry))
-		{
-			while($row = $this->db_fetch_object())
-			{
-				$this->result[] = $row;
-			}
-			return true;
-		}
-		else
-		{
-			$this->errormsg='Fehler bei Datenbankabfrage ' .$this->db_last_error();
-			return false;
-		}
-	}
 }
 ?>

include/tw/vilesci_menu_main.inc.php

@@ -70,7 +70,6 @@ $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

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

public/js/api/checkperson.js

@@ -1,23 +0,0 @@
-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,7 +23,6 @@ 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,
@@ -33,6 +32,5 @@ export default {
     studstatus,
     stv,
     notiz,
-    betriebsmittel,
-    checkperson
-};
+    betriebsmittel
+};

public/js/apps/Bismeldestichtag/Bismeldestichtag.js

@@ -15,7 +15,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import {BismeldestichtagHelper} from './BismeldestichtagHelper.js';
+import {BismeldestichtagTabulatorOptions} from './TabulatorSetup.js';
+import {BismeldestichtagTabulatorEventHandlers} from './TabulatorSetup.js';
 
 import {CoreFilterCmpt} from '../../components/filter/Filter.js';
 import {CoreNavigationCmpt} from '../../components/navigation/Navigation.js';
@@ -28,60 +29,8 @@ import Phrasen from '../../plugin/Phrasen.js';
 const bismeldestichtagApp = Vue.createApp({
 	data: function() {
 		return {
-			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();
-					}
-				}
-			],
+			bismeldestichtagTabulatorOptions: BismeldestichtagTabulatorOptions,
+			bismeldestichtagTabulatorEventHandlers: BismeldestichtagTabulatorEventHandlers,
 			meldestichtag: null, // date of Meldestichtag
 			semList: null, // all Studiensemester for dropdown
 			currSem: null, // selected Studiensemester
@@ -98,6 +47,9 @@ 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

@@ -1,22 +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 BismeldestichtagHelper = {
-	formatDate: function(date) {
-		return date.replace(/(.*)-(.*)-(.*)/, '$3.$2.$1');
-	}
-}

public/js/apps/Bismeldestichtag/TabulatorSetup.js

@@ -0,0 +1,75 @@
+/**
+ * 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

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

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

@@ -26,8 +26,7 @@ export default {
 			saving: false,
 			formData: {
 				grund: ''
-			},
-			unrulyInternal: false
+			}
 		}
 	},
 	computed: {
@@ -78,16 +77,6 @@ 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 += "";
 					
@@ -117,16 +106,11 @@ 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">
@@ -188,11 +172,7 @@ export default {
 							<option value="textLong_plageat">{{$p.t('studierendenantrag', 'dropdown_plageat')}}
 							</option>					
 							<option value="textLong_MissingZgv">{{$p.t('studierendenantrag', 'dropdown_MissingZgv')}}
-							</option>	
-<!--
-							<option value="textLong_unruly">{{$p.t('studierendenantrag', 'dropdown_unruly')}}
-							</option>
--->
+							</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

@@ -1,70 +0,0 @@
-$(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,7 +14,6 @@ $(document).ready(function ()
 
 	$('.saveStammdaten').click(function()
 	{
-
 		var kontakt = [];
 		$('.kontakt_input').each(function(){
 			kontakt.push({
@@ -63,16 +62,15 @@ var Stammdaten = {
 			CALLED_PATH + "/updateStammdaten/",
 			data,
 			{
-				successCallback: function(response, textStatus, jqXHR) {
-					if (FHC_AjaxClient.isSuccess(response))
+				successCallback: function(data, textStatus, jqXHR) {
+					if (FHC_AjaxClient.isSuccess(data))
 					{
 						FHC_DialogLib.alertSuccess("Done!");
 						Stammdaten._updated();
-						PersonCheck.update(data)
 					}
 					else
 					{
-						FHC_DialogLib.alertError(FHC_AjaxClient.getError(response));
+						FHC_DialogLib.alertError(FHC_AjaxClient.getError(data));
 					}
 				},
 				errorCallback: function() {
@@ -151,7 +149,6 @@ 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

@@ -1,289 +0,0 @@
-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,6 +394,5 @@ 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,6 +69,5 @@ 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,7 +58,6 @@ 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>';
@@ -302,7 +301,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","unruly"),
+	"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_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"),
@@ -478,4 +477,4 @@ if (!$result=@$db->db_query($sql_query))
 		}
 if($error==false)
 	echo '<br>Gegenpruefung fehlerfrei';
-?>
+?>

system/dbupdate_3.4/28260_vertraege.php

@@ -85,8 +85,6 @@ 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)
 		);
 
@@ -572,37 +570,3 @@ 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

@@ -1,17 +0,0 @@
-<?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,11 +1,15 @@
 <?php
 if (! defined('DB_NAME')) exit('No direct script access allowed');
 
-$qry = "
+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 = "
 	    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, path_kurzbz) AS (
+		WITH RECURSIVE vw_oe_path(oe_kurzbz, bezeichnung, oe_parent_kurzbz, organisationseinheittyp_kurzbz, oetyp_bezeichnung, depth, path) 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 AS path_kurzbz
+		    oe.oe_kurzbz, oe.bezeichnung, oe.oe_parent_kurzbz, oe.organisationseinheittyp_kurzbz, oetyp.bezeichnung AS oetyp_bezeichnung, 0, '/' || oetyp.bezeichnung || ' ' || oe.bezeichnung AS path 
 		  FROM 
 		    public.tbl_organisationseinheit oe
 		  JOIN
@@ -14,7 +18,7 @@ $qry = "
 		    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, oet.path_kurzbz || '/' || oe.oe_kurzbz AS path_kurzbz
+		    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
 		  FROM 
 		    public.tbl_organisationseinheit oe, vw_oe_path oet
 		  JOIN
@@ -25,27 +29,11 @@ $qry = "
 		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

@@ -1403,53 +1403,14 @@ $filters = array(
 						{"name": "Wochenstunden"}, 
 						{"name": "WS_von"}, 
 						{"name": "WS_bis"}, 
-						{"name": "Standardkostenstelle"},
-						{"name": "DV_status"}
+						{"name": "Standardkostenstelle"}
 					],
 					"filters": [
 						{
-							"name": "DV_status",
+							"name": "Nachname",
 							"option": "",
-							"operation": "nequal",
-							"condition": "beendet"
-						}
-					]
-				}
-			',
-			'oe_kurzbz' => null,
-		),
-		array(
-			'app' => 'personalverwaltung',
-			'dataset_name' => 'handyverwaltung',
-			'filter_kurzbz' => 'ma4handyverwaltung_beendet',
-			'description' => '{MA Handyverwaltung (DV beendet)}',
-			'sort' => 2,
-			'default_filter' => false,
-			'filter' => '
-				{
-					"name": "MA Handyverwaltung (DV beendet)",
-					"columns": [
-						{"name": "UID"},
-						{"name": "PersonId"},
-						{"name": "Vorname"},
-						{"name": "Nachname"},
-						{"name": "EMail"}, 
-						{"name": "Unternehmen"}, 
-						{"name": "Vertragsart"}, 
-						{"name": "DV_von"}, 
-						{"name": "DV_bis"}, 
-						{"name": "Wochenstunden"}, 
-						{"name": "WS_von"}, 
-						{"name": "WS_bis"}, 
-						{"name": "Standardkostenstelle"},
-						{"name": "DV_status"}
-					],
-					"filters": [
-						{
-							"name": "DV_status",
-							"option": "",
-							"operation": "equal",
-							"condition": "beendet"
+							"operation": "",
+							"condition": ""
 						}
 					]
 				}

system/phrasesupdate.php

@@ -2662,26 +2662,6 @@ $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',
@@ -5341,26 +5321,6 @@ 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',
@@ -10027,13 +9987,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, § 20 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, § 18 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, § 20 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, § 18 Para. 2 and 3).',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -18188,26 +18148,6 @@ array(
 			)
 		)
 	),
-	array(
-		'app' => 'international',
-		'category' => 'international',
-		'phrase' => 'alledurchgefuehrten',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Alle durchgeführten anzeigen',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Show all performed',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
 	array(
 		'app' => 'international',
 		'category' => 'international',
@@ -18723,366 +18663,6 @@ array(
 			)
 		)
 	),
-	array(
-		'app' => 'international',
-		'category' => 'international',
-		'phrase' => 'statusGeplant',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'geplant',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'planned',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'international',
-		'category' => 'international',
-		'phrase' => 'statusGeplantDesc',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Studierende hat die Maßnahme geplant.',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'The student has planned the measure.',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'international',
-		'category' => 'international',
-		'phrase' => 'statusAkzeptiert',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'akzeptiert',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'accepted',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'international',
-		'category' => 'international',
-		'phrase' => 'statusAkzeptiertDesc',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Die geplante Maßnahme wurde akzeptiert.',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'The planned measure has been accepted.',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'international',
-		'category' => 'international',
-		'phrase' => 'statusDurchgefuehrt',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'durchgeführt',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'performed',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'international',
-		'category' => 'international',
-		'phrase' => 'statusDurchgefuehrtDesc',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Eine Bestätigung wurde hochgeladen.',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'A confirmation has been uploaded.',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'international',
-		'category' => 'international',
-		'phrase' => 'statusBestaetigt',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'bestätigt',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'confirmed',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'international',
-		'category' => 'international',
-		'phrase' => 'statusBestaetigtDesc',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Die hochgeladene Bestätigung wurde akzeptiert.',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'The uploaded confirmation has been accepted.',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'international',
-		'category' => 'international',
-		'phrase' => 'statusAbgelehnt',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'abgelehnt',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'declined',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'international',
-		'category' => 'international',
-		'phrase' => 'statusAbgelehntDesc',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Die Maßnahme wurde abgelehnt.',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'The measure was rejected.',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'international',
-		'category' => 'international',
-		'phrase' => 'ampelRed',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Es wurden keine Maßnahmen geplant oder alle wurden abgelehnt.',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'No measures have been planned, or all have been rejected.',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'international',
-		'category' => 'international',
-		'phrase' => 'ampelYellow',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Mindestens eine Maßnahme wurde akzeptiert.',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'At least one measure has been accepted.',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'international',
-		'category' => 'international',
-		'phrase' => 'ampelOrange',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Es gibt mindestens eine geplante oder durchgeführte Maßnahme.',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'There is at least one planned or performed measure.',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'international',
-		'category' => 'international',
-		'phrase' => 'ampelGreenyellow',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Nur bestätigte Maßnahmen vorhanden, aber weniger als 5 ECTs.',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Only confirmed measures, but fewer than 5 ECTs.',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'international',
-		'category' => 'international',
-		'phrase' => 'ampelGreen',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Es wurden 5 ECTs erreicht.',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => '5 ECTs points have been achieved.',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'international',
-		'category' => 'international',
-		'phrase' => 'mailMeldungzuviele',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Die Anzahl der Empfänger überschreitet 50. Bitte verwenden Sie einen Filter (z.B. Semester), um die Empfängeranzahl zu reduzieren.',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'The number of recipients exceeds 50. Please use a filter (e.g., semester) to reduce the number of recipients.',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'international',
-		'category' => 'international',
-		'phrase' => 'mailMeldung',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Keine Studierenden ohne geplante Maßnahmen gefunden.',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'No students without planned measures were found.',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'international',
-		'category' => 'international',
-		'phrase' => 'mailButton',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'E-Mail nur an Studierende, die keine Maßnahmen geplant haben.',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Send email only to students who have no planned measures.',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
 	array(
 		'app' => 'international',
 		'category' => 'international',
@@ -19123,26 +18703,6 @@ array(
 			)
 		)
 	),
-	array(
-		'app' => 'international',
-		'category' => 'international',
-		'phrase' => 'mailversenden',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Mail versenden',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Send mail',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
 	array(
 		'app' => 'international',
 		'category' => 'international',
@@ -21230,46 +20790,6 @@ 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',
@@ -23611,26 +23131,6 @@ 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',
@@ -23811,46 +23311,6 @@ 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',
@@ -25793,7 +25253,7 @@ array(
 				'insertvon' => 'system'
 			)
 		)
-	),
+	),	
 	array(
 		'app' => 'personalverwaltung',
 		'category' => 'gehaltsband',
@@ -29718,66 +29178,6 @@ array(
 			)
 		)
 	),
-	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',
@@ -31145,28 +30545,6 @@ array(
 			)
 		)
 	),
-	// Betriebsmittel end
-	array(
-		'app' => 'core',
-		'category' => 'uhstat',
-		'phrase' => 'unbekannt',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'unbekannt',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'unknown',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	)
-
 );
 
 

vilesci/lehre/lehreinheiten_vorrueckung.php

@@ -106,7 +106,7 @@ echo '<!DOCTYPE HTML>
 	</script>
 </head>
 <body style="background-color:#eeeeee;">
-<h2>LV-Teile Vorr&uuml;ckung</h2>
+<h2>Lehreinheiten Vorr&uuml;ckung</h2>
 ';
 echo '<form action="'.$_SERVER['PHP_SELF'].'" method="GET">';
 echo 'Studiengang: <SELECT name="studiengang_kz">';
@@ -246,17 +246,9 @@ if ($studiengang_kz != '' && $stsem_von != '' && $stsem_nach != '')
 	{
 		$anzahl_nach = $db->db_num_rows($result);
 		$baseurl = basename($_SERVER['REQUEST_URI']);
-		if ($anzahl_von == 0 && !isset($_GET['continue']))
+		if ($anzahl_nach >= $anzahl_von && !isset($_GET['continue']))
 		{
-			echo '<br><br><span style="color:orange">Es sind kein LV-Teile im
-				'.$stsem_von.' in '.$stg_arr[$studiengang_kz].' '.$semester.' vorhanden.
-				Trotzdem fortsetzen?</span><br><br>
-					<form action="'.$baseurl.'&continue" method="POST"><input type="submit" value="Fortsetzen"></form>';
-			die ();
-		}
-		elseif ($anzahl_von > 0 && $anzahl_nach >= $anzahl_von && !isset($_GET['continue']))
-		{
-			echo '<br><br><span style="color:red">Es sind schon '.$anzahl_nach.' LV-Teile fuer das
+			echo '<br><br><span style="color:red">Es sind schon Lehreinheiten fuer das
 				'.$stsem_nach.' in '.$stg_arr[$studiengang_kz].' '.$semester.' vorhanden.
 				Trotzdem fortsetzen?</span><br><br>
 					<form action="'.$baseurl.'&continue" method="POST"><input type="submit" value="Fortsetzen"></form>';
@@ -561,15 +553,15 @@ if ($studiengang_kz != '' && $stsem_von != '' && $stsem_nach != '')
 	}
 	else
 	{
-		$text .= 'Fehler beim Laden der LV-Teile '.$db->db_last_error();
+		$text .= 'Fehler beim Laden der Lehreinheiten '.$db->db_last_error();
 		$error_lehreinheit++;
 	}
 
 	echo "<br><br>";
-	echo "Vorgerueckte LV-Teile: $anzahl_lehreinheiten<br>";
+	echo "Vorgerueckte Lehreinheiten: $anzahl_lehreinheiten<br>";
 	echo "Vorgerueckte LEMitarbeiter: $anzahl_lehreinheitmitarbeiter<br>";
 	echo "Vorgerueckte LEGruppen: $anzahl_lehreinheitgruppe<br>";
-	echo "Fehler bei LV-Teil: $error_lehreinheit<br>";
+	echo "Fehler bei Lehreinheiten: $error_lehreinheit<br>";
 	echo "Fehler bei LEMitarbeiter: $error_lehreinheitmitarbeiter<br>";
 	echo "Fehler bei LEGruppen: $error_lehreinheitmitarbeiter<br>";
 

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,8 +2306,6 @@ $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>
@@ -2577,7 +2575,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'))
@@ -2590,7 +2588,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();
@@ -2703,9 +2701,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
@@ -2716,9 +2714,9 @@ if($reihungstest_id!='')
 						)
 				ORDER BY ende DESC LIMIT 1
 				)
-
+			
 			UNION
-
+			
 			(
 				SELECT studiensemester_kurzbz
 				FROM PUBLIC.tbl_studiensemester
@@ -3154,7 +3152,7 @@ if($reihungstest_id!='')
 					echo '</div>';
 			}
 		}
-}
+} 
 
 /**
  * Liefert die interne Empfangsadresse des Studiengangs fuer den Mailversand.
@@ -3170,18 +3168,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 != '')
 	{
@@ -3201,7 +3199,7 @@ function getMailEmpfaenger($studiengang_kz, $studienplan_id = null, $orgform_kur
 	}
 	else
 		$empfaenger = $studiengang->email;
-
+		
 	if ($empfaenger != '')
 		return $empfaenger;
 	else