Merge branch 'master' into feature-63428/Infomail_Foto

- expand InputComponent for dynamic adding of actionButton to Form Upload Image
- add Phrases for Infomail

application/config/navigation.php

@@ -336,24 +336,3 @@ $config['navigation_menu']['system/issues/Issues/*'] = array(
 		'requiredPermissions' => array('admin:rw')
 	),
 );
-
-$config['navigation_menu']['apps'] = [
-	'stv' => [
-		'link' => site_url('studentenverwaltung'),
-		'description' => 'Studierendenverwaltung',
-		#'icon' => 'users',
-		'requiredPermissions' => array('admin:r', 'assistenz:r')
-	],
-	'lvv' => [
-		'link' => site_url('lVVerwaltung'),
-		'description' => 'LV Verwaltung',
-		#'icon' => 'person-chalkboard',
-		'requiredPermissions' => array('admin:r', 'assistenz:r')
-	],
-	'lav' => [
-		'link' => site_url('lehre/lehrauftrag/Lehrauftrag/Dashboard'),
-		'description' => 'Lehraufträge',
-		#'icon' => 'person-chalkboard',
-		'requiredPermissions' => array('lehre/lehrauftrag_bestellen:r', 'lehre/lehrauftrag_erteilen:r')
-	]
-];

application/config/routes.php

@@ -1,6 +1,6 @@
 <?php
 
-if (! defined('BASEPATH')) exit('No direct script access allowed');
+defined('BASEPATH') OR exit('No direct script access allowed');
 
 /*
 | -------------------------------------------------------------------------
@@ -51,7 +51,7 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
 |   my-controller/my-method -> my_controller/my_method
 */
 $route['default_controller'] = defined('CIS4') && CIS4 ? 'Cis4' : 'Vilesci';
-$route['translate_uri_dashes'] = false;
+$route['translate_uri_dashes'] = FALSE;
 
 // Class name conflicts
 $route['api/v1/organisation/[S|s]tudiengang/(:any)'] = 'api/v1/organisation/studiengang2/$1';
@@ -71,9 +71,9 @@ $route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})'] = 'api/frontend/v1/stv
 
 // (studiensemester_kurzbz)/inout[/(incoming|outgoing|gemeinsamestudien)]
 $route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/inout'] = 'api/frontend/v1/stv/Students/index';
-$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/inout/incoming'] = 'api/frontend/v1/stv/Students/getIncoming/$1';
-$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/inout/outgoing'] = 'api/frontend/v1/stv/Students/getOutgoing/$1';
-$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/inout/gemeinsamestudien'] = 'api/frontend/v1/stv/Students/getGemeinsamestudien/$1';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/inout/incoming'] = 'api/frontend/v1/stv/Students/getIncoming';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/inout/outgoing'] = 'api/frontend/v1/stv/Students/getOutgoing';
+$route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/inout/gemeinsamestudien'] = 'api/frontend/v1/stv/Students/getGemeinsamestudien';
 
 // (studiengang_kz)/prestudent[/(studiensemester_kurzbz)[/(filter)[/(otherfilter)]]]
 $route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/prestudent'] = 'api/frontend/v1/stv/Students/getPrestudents/$1';

application/config/searchfunctions.php

@@ -29,7 +29,7 @@ $config['similar'] = [
 
 $config['vector'] = [
 	'priority' => 1,
-	'rank' => "ts_rank({field}, plainto_tsquery('simple', {word}))",
-	'compare' => "plainto_tsquery('simple', {word}) @@ {field}"
+	'rank' => "ts_rank({field}, to_tsquery('simple', {word}))",
+	'compare' => "to_tsquery('simple', {word}) @@ {field}"
 ];
 

application/config/searchstv.php

@@ -7,43 +7,5 @@ $CI =& get_instance();
 
 
 $config['student'] = $CI->config->item('student', 'search');
-$config['student']['searchfields']['pkz'] = [
-	'alias' => ['personenkennzeichen', 'personalid'],
-	'comparison' => 'equals',
-	'field' => 'matrikelnr'
-];
-$config['student']['searchfields']['matrnr'] = [
-	'alias' => ['matrikelnr', 'matrikelnummer', 'matrno', 'matriculationno', 'matriculationnumber', 'studno', 'studentno', 'studentnumber'],
-	'comparison' => 'equals',
-	'field' => 'matr_nr',
-	'join' => [
-		[
-			'table' => "public.tbl_prestudent",
-			'using' => "prestudent_id"
-		],
-		[
-			'table' => "public.tbl_person",
-			'using' => "person_id"
-		]
-	]
-];
 
 $config['prestudent'] = $CI->config->item('prestudent', 'search');
-$config['prestudent']['searchfields']['pkz'] = [
-	'alias' => ['personenkennzeichen', 'personalid'],
-	'comparison' => 'equals',
-	'field' => 'matrikelnr',
-	'join' => [
-		'table' => "public.tbl_student",
-		'using' => "prestudent_id"
-	]
-];
-$config['prestudent']['searchfields']['matrnr'] = [
-	'alias' => ['matrikelnr', 'matrikelnummer', 'matrno', 'matriculationno', 'matriculationnumber', 'studno', 'studentno', 'studentnumber'],
-	'comparison' => 'equals',
-	'field' => 'matr_nr',
-	'join' => [
-		'table' => "public.tbl_person",
-		'using' => "person_id"
-	]
-];

application/config/stv.php

@@ -61,13 +61,9 @@ $config['tabs'] =
 		'notes' => [
 			//if true, the count of Messages will be shown in the header of the Tab Messages
 			'showCountNotes' => true
-		],
-		'combinePeople' => [
-			//multitab should only be shown with this length of selection
-			'validCountMulti' => 2,
-		],
+		]
 	];
-
+	
 // List of fields to show when ZGV_DOKTOR_ANZEIGEN is defined
 $fieldsZgvDoktor = ['zgvdoktorort', 'zgvdoktordatum', 'zgvdoktornation', 'zgvdoktor_erfuellt', 'zgvdoktor_code'];
 
@@ -88,16 +84,6 @@ if (!defined('ZGV_DOKTOR_ANZEIGEN') || !ZGV_DOKTOR_ANZEIGEN) {
 	);
 }
 
-$config['tabs']['projektarbeit']['defaultProjektbetreuerStunden'] =
-	defined('FAS_STUDIERENDE_PROJEKTARBEIT_DEFAULT_BETREUER_STUNDEN_BACHELOR')
-	? FAS_STUDIERENDE_PROJEKTARBEIT_DEFAULT_BETREUER_STUNDEN_BACHELOR
-	: '0.0';
-$config['tabs']['projektarbeit']['defaultProjektbetreuerStundenDiplom'] =
-	defined('FAS_STUDIERENDE_PROJEKTARBEIT_DEFAULT_BETREUER_STUNDEN_MASTER')
-	? FAS_STUDIERENDE_PROJEKTARBEIT_DEFAULT_BETREUER_STUNDEN_MASTER
-	: '0.0';
-$config['tabs']['projektarbeit']['defaultProjektbetreuerStundensatz'] = '80.0';
-
 $config['student_tab_order'] = [
 	'details',
 	'notes',
@@ -111,7 +97,6 @@ $config['student_tab_order'] = [
 	'grades',
 	'exam',
 	'exemptions',
-	'projektarbeit',
 	'finalexam',
 	'mobility',
 	'jointstudies',
@@ -124,9 +109,7 @@ $config['student_tab_order'] = [
 $config['students_tab_order'] = [
 	'banking',
 	'status',
-	'messages',
 	'groups',
 	'finalexam',
-	'combinePeople',
 	'archive',
 ];

application/controllers/Cis/Documents.php

@@ -72,7 +72,7 @@ class Documents extends Auth_Controller
 
 		$stgs = [];
 		$stsemArray = [];
-		$buchungstypen = defined("CIS_DOKUMENTE_STUDIENBEITRAG_TYPEN") ? unserialize(CIS_DOKUMENTE_STUDIENBEITRAG_TYPEN) : [];
+		$buchungstypen = implode('\',\'', defined("CIS_DOKUMENTE_STUDIENBEITRAG_TYPEN") ? unserialize(CIS_DOKUMENTE_STUDIENBEITRAG_TYPEN) : []);
 		$person_ids = [];
 		foreach ($stati as $status) {
 			$person_ids[] = $status->person_id;

application/controllers/Cis/ProfilUpdate.php

@@ -13,7 +13,7 @@ class ProfilUpdate extends Auth_Controller
 	{
 		parent::__construct([
 			'index' => ['student/stammdaten:r', 'mitarbeiter/stammdaten:r'],
-			'show' => ['student/stammdaten:r', 'mitarbeiter/stammdaten:r', 'basis/cis:r'],
+			'show' => ['basis/cis:r'],
 			'id' => ['student/stammdaten:r', 'mitarbeiter/stammdaten:r']
 		]);
 

application/controllers/Cis/Pub.php

@@ -14,7 +14,7 @@ class Pub extends Auth_Controller
 	{
 		parent::__construct(
 		    array(
-			'bild' => ['basis/cis:r', 'assistenz:r']
+			'bild' => ['basis/cis:r']
 		    )
 		);
 	}

application/controllers/NeueNachricht.php

@@ -20,18 +20,11 @@ class NeueNachricht extends Auth_Controller
 	 */
 	public function _remap()
 	{
-		$typeid = $this->input->post('typeid');
-		$ids = ($this->input->post('ids') && strpos($this->input->post('ids'), ',')) 
-			? explode(',', $this->input->post('ids'))
-			: $this->input->post('ids');
-
 		//now working
 		$this->load->view('Nachrichten', [
 			'permissions' => [
 				'assistenz_schreibrechte' => $this->permissionlib->isBerechtigt('assistenz','suid'),
-			],
-			'ids' => $ids,
-			'typeid' => $typeid
+			]
 		]);
 	}
 }

application/controllers/Studentenverwaltung.php

@@ -32,10 +32,6 @@ class Studentenverwaltung extends Auth_Controller
 				'student/keine_studstatuspruefung' => $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung'),
 				'lehre/reihungstestAufsicht' => $this->permissionlib->isBerechtigt('lehre/reihungstestAufsicht'),
 				'system/change_outputformat' => $this->permissionlib->getOE_isEntitledFor('system/change_outputformat'),
-				'student/editBakkZgv' => $this->permissionlib->isBerechtigt('student/editBakkZgv'),
-				'student/editMakkZgv' => $this->permissionlib->isBerechtigt('student/editMakkZgv'),
-				'student/editDokZgv' => $this->permissionlib->isBerechtigt('student/editDokZgv'),
-				'student/editBismelden' => $this->permissionlib->isBerechtigt('student/editBismelden')
 			],
 			'variables' => [
 				'semester_aktuell' => $this->variablelib->getVar('semester_aktuell')

application/controllers/api/frontend/v1/Documents.php

@@ -442,10 +442,6 @@ class Documents extends FHCAPI_Controller
 			'betreuerart_kurzbz',
 			'studiensemester_kurzbz'
 		] as $key) {
-			if (in_array($xsl, array('Ausbildungsver', 'AusbVerEng')) && $key === 'uid')
-			{
-				continue;
-			}
 			$value = $this->input->post_get($key);
 			if ($value !== null)
 				$params .= '&' . $key . '=' . urlencode($value);

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

@@ -119,19 +119,7 @@ class Lehrveranstaltung extends FHCAPI_Controller
 			if (hasData($lehreinheiten_data))
 			{
 				$lehreinheiten = getData($lehreinheiten_data);
-
-				if (!isset($row->_children))
-				{
-					$row->_children = $lehreinheiten;
-				}
-				else
-				{
-					if (!is_array($row->_children))
-					{
-						$row->_children = [$row->_children];
-					}
-					$row->_children = array_merge($row->_children, $lehreinheiten);
-				}
+				$rowData->_children = $lehreinheiten;
 			}
 
 			if (!isEmptyString($row->studienplan_lehrveranstaltung_id_parent))

application/controllers/api/frontend/v1/ProfilUpdate.php

@@ -637,7 +637,7 @@ class ProfilUpdate extends FHCAPI_Controller
 				//? Send email to the Studiengangsassistentinnen
 				$this->StudentModel->addSelect(["public.tbl_studiengang.email"]);
 				$this->StudentModel->addJoin("public.tbl_benutzer", "public.tbl_benutzer.uid = public.tbl_student.student_uid");
-				$this->StudentModel->addJoin("public.tbl_prestudent", "public.tbl_benutzer.person_id = public.tbl_prestudent.person_id and public.tbl_student.studiengang_kz = public.tbl_prestudent.studiengang_kz");
+				$this->StudentModel->addJoin("public.tbl_prestudent", "public.tbl_benutzer.person_id = public.tbl_prestudent.person_id");
 				$this->StudentModel->addJoin("public.tbl_prestudentstatus", "public.tbl_prestudentstatus.prestudent_id = public.tbl_prestudent.prestudent_id");
 				$this->StudentModel->addJoin("public.tbl_studiengang", "public.tbl_studiengang.studiengang_kz = public.tbl_prestudent.studiengang_kz");
 				$this->StudentModel->addGroupBy(["public.tbl_studiengang.email"]);
@@ -706,13 +706,7 @@ class ProfilUpdate extends FHCAPI_Controller
 
 	private function setStatusOnUpdateRequest($id, $status, $status_message)
 	{
-		return $this->ProfilUpdateModel->update([$id], [
-			"status" => $status,
-			"status_timestamp" => "NOW()",
-			"status_message" => $status_message,
-			"updateamum" => "NOW()",
-			"updatevon" => getAuthUID()
-		]);
+		return $this->ProfilUpdateModel->update([$id], ["status" => $status, "status_timestamp" => "NOW()", "status_message" => $status_message]);
 	}
 	
 	private function updateRequestedChange($id, $requested_change)
@@ -722,12 +716,13 @@ class ProfilUpdate extends FHCAPI_Controller
 	
 	private function deleteOldVersionFile($dms_id)
 	{
-		if (!isset($dms_id)) {
-			return true;
-		}
-
 		// starting the transaction
 		$this->db->trans_start();
+		
+		
+		if (!isset($dms_id)) {
+			return;
+		}
 
 		//? delete the file from the profilUpdate first
 		$profilUpdateFileDelete = $this->ProfilUpdateModel->removeFileFromProfilUpdate($dms_id);
@@ -782,8 +777,13 @@ class ProfilUpdate extends FHCAPI_Controller
 
 		$res = $this->StudentModel->execReadOnlyQuery($query, [$student_uid]);
 		$res = $this->getDataOrTerminateWithError($res, $this->p->t('profilUpdate', 'profilUpdate_loadingOE_error'));	
-		$oe = ($res[0])->oe_kurzbz;
-		return $oe;
+		$res = array_map(
+			function ($item) {
+				return $item->oe_kurzbz;
+			},
+			$res
+		);
+		return $res;
 	}
 
 	private function handleAdresse($requested_change, $personID)
@@ -813,7 +813,7 @@ class ProfilUpdate extends FHCAPI_Controller
 			$insert_adresse_id = $insertID;
 			$insert_adresse_id = $this->getDataOrTerminateWithError($insert_adresse_id, $this->p->t('profilUpdate', 'profilUpdate_insertAdresse_error'));
 			if ($insert_adresse_id) {
-				$this->handleDupplicateZustellAdressen($requested_change['zustelladresse'], $insert_adresse_id, $personID);
+				$this->handleDupplicateZustellAdressen($requested_change['zustelladresse'], $insert_adresse_id);
 			}
 		}
 		//! DELETE
@@ -825,33 +825,12 @@ class ProfilUpdate extends FHCAPI_Controller
 		}
 		//! UPDATE
 		else {
-			$curadresse_res = $this->AdresseModel->load($adresse_id);
-			$curadresse = ($this->getDataOrTerminateWithError($curadresse_res))[0];
+			$requested_change['updateamum'] = "NOW()";
+			$requested_change['updatevon'] = getAuthUID();
+			$update_adresse_id = $this->AdresseModel->update($adresse_id, $requested_change);
+			$update_adresse_id = $this->getDataOrTerminateWithError($update_adresse_id, $this->p->t('profilUpdate', 'profilUpdate_updateAdresse_error'));
+			$this->handleDupplicateZustellAdressen($requested_change['zustelladresse'], $update_adresse_id);
 
-			if($curadresse->heimatadresse)
-			{
-				$tmpadresse = array_merge((array) $curadresse, $requested_change);
-				unset($tmpadresse["adresse_id"]);
-				$tmpadresse['insertamum'] = "NOW()";
-				$tmpadresse['insertvon'] = getAuthUID();
-				$tmpadresse['person_id'] = $personID;
-				unset($tmpadresse["heimatadresse"]);
-				unset($tmpadresse["updateamum"]);
-				unset($tmpadresse["updatevon"]);
-
-				$tmpadresse_res = $this->AdresseModel->insert($tmpadresse);
-				$tmpadresse_id = $this->getDataOrTerminateWithError($tmpadresse_res, $this->p->t('profilUpdate', 'profilUpdate_insertAdresse_error'));
-				$this->handleDupplicateZustellAdressen($requested_change['zustelladresse'], $tmpadresse_id, $personID);
-			}
-			else
-			{
-				$requested_change['updateamum'] = "NOW()";
-				$requested_change['updatevon'] = getAuthUID();
-
-				$update_adresse_id = $this->AdresseModel->update($adresse_id, $requested_change);
-				$update_adresse_id = $this->getDataOrTerminateWithError($update_adresse_id, $this->p->t('profilUpdate', 'profilUpdate_updateAdresse_error'));
-				$this->handleDupplicateZustellAdressen($requested_change['zustelladresse'], $update_adresse_id, $personID);
-			}
 		}
 		return $insertID ?? null;
 	}
@@ -873,7 +852,7 @@ class ProfilUpdate extends FHCAPI_Controller
 			$insert_kontakt_id = $insertID;
 			$insert_kontakt_id = $this->getDataOrTerminateWithError($insert_kontakt_id, $this->p->t('profilUpdate', 'profilUpdate_insertKontakt_error'));
 			if ($insert_kontakt_id) {
-				$this->handleDupplicateZustellKontakte($requested_change['zustellung'], $insert_kontakt_id, $requested_change['kontakttyp'], $personID);
+				$this->handleDupplicateZustellKontakte($requested_change['zustellung'], $insert_kontakt_id);
 			}
 		}
 		//! DELETE
@@ -890,18 +869,18 @@ class ProfilUpdate extends FHCAPI_Controller
 			$update_kontakt_id = $this->KontaktModel->update($kontakt_id, $requested_change);
 			$update_kontakt_id = $this->getDataOrTerminateWithError($update_kontakt_id, $this->p->t('profilUpdate', 'profilUpdate_updateKontakt_error'));
 			if ($update_kontakt_id) {
-				$this->handleDupplicateZustellKontakte($requested_change['zustellung'], $update_kontakt_id, $requested_change['kontakttyp'], $personID);
+				$this->handleDupplicateZustellKontakte($requested_change['zustellung'], $update_kontakt_id);
 			}
 		}
 		return isset($insertID) ? $insertID : null;
 	}
 
-	private function handleDupplicateZustellAdressen($zustellung, $adresse_id, $person_id)
+	private function handleDupplicateZustellAdressen($zustellung, $adresse_id)
 	{
 		if ($zustellung) {
 			$this->PersonModel->addSelect("public.tbl_adresse.adresse_id");
 			$this->PersonModel->addJoin("public.tbl_adresse", "public.tbl_adresse.person_id = public.tbl_person.person_id");
-			$zustellAdressenArray = $this->PersonModel->loadWhere(["public.tbl_person.person_id" => $person_id, "zustelladresse" => TRUE]);
+			$zustellAdressenArray = $this->PersonModel->loadWhere(["public.tbl_person.person_id" => $this->pid, "zustelladresse" => TRUE]);
 			if (isError($zustellAdressenArray)) {
 				$this->terminateWithError($this->p->t('profilUpdate', 'profilUpdate_loadingZustellAdressen_error'));
 			}
@@ -914,8 +893,6 @@ class ProfilUpdate extends FHCAPI_Controller
 					return $adresse->adresse_id != $adresse_id;
 				});
 	
-				$this->addMeta('bhzustelladressen', $zustellAdressenArray);
-
 				// remove the zustelladresse from all other zustelladressen
 				foreach ($zustellAdressenArray as $adresse) {
 					$this->AdresseModel->update($adresse->adresse_id, ["zustelladresse" => FALSE]);
@@ -925,16 +902,12 @@ class ProfilUpdate extends FHCAPI_Controller
 		}
 	}
 
-	private function handleDupplicateZustellKontakte($zustellung, $kontakt_id, $kontakttyp, $person_id)
+	private function handleDupplicateZustellKontakte($zustellung, $kontakt_id)
 	{
 		if ($zustellung) {
 			$this->PersonModel->addSelect("public.tbl_kontakt.kontakt_id");
 			$this->PersonModel->addJoin("public.tbl_kontakt", "public.tbl_kontakt.person_id = public.tbl_person.person_id");
-			$zustellKontakteArray = $this->PersonModel->loadWhere([
-				"public.tbl_person.person_id" => $person_id,
-				"zustellung" => TRUE,
-				"kontakttyp" => $kontakttyp
-			]);
+			$zustellKontakteArray = $this->PersonModel->loadWhere(["public.tbl_person.person_id" => $this->pid, "zustellung" => TRUE]);
 			if (!isSuccess($zustellKontakteArray)) {
 				return error($this->p->t('profilUpdate', 'profilUpdate_loadingZustellkontakte_error'));
 			}

application/controllers/api/frontend/v1/Studium.php

@@ -29,7 +29,7 @@ class Studium extends FHCAPI_Controller
 	public function __construct()
 	{
 		parent::__construct([
-			'getAllStudienSemester'=> self::PERM_LOGGED,
+			'getStudienAllSemester'=> self::PERM_LOGGED,
 			'getStudiengaengeForStudienSemester'=> self::PERM_LOGGED,
 			'getStudienplaeneBySemester'=> self::PERM_LOGGED,
 			'getLvEvaluierungInfo'=> self::PERM_LOGGED,
@@ -51,7 +51,7 @@ class Studium extends FHCAPI_Controller
 	//------------------------------------------------------------------------------------------------------------------
 	// Public methods
 
-	public function getAllStudienSemester(){
+	public function getStudienAllSemester(){
 
 		$parameter_studiensemester = $this->input->get('studiensemester',true);
         $parameter_studiengang = $this->input->get('studiengang',true);
@@ -59,26 +59,24 @@ class Studium extends FHCAPI_Controller
 		$parameter_studienplan = $this->input->get('studienplan',true);
 
 		$aktuelles_studiensemester = current($this->getDataOrTerminateWithError($this->StudiensemesterModel->getAktOrNextSemester()));
-		
-		if($this->getDataOrTerminateWithError($this->StudentModel->isStudent(getAuthUID()))){
-			$lv_result =$this->StudentlehrverbandModel->loadWhere([
-				"student_uid" => getAuthUID(),
-				"studiensemester_kurzbz" => $aktuelles_studiensemester->studiensemester_kurzbz
-			]);
-			$lv_data = $this->getDataOrTerminateWithError($lv_result);
-			
-			if ($studentLehrverband = current($lv_data)) {
-				$student_studiensemester = $studentLehrverband->studiensemester_kurzbz;
-				$student_studiengang = $studentLehrverband->studiengang_kz;
-				$student_semester = $studentLehrverband->semester;
-			}
-			
-			$student_studienplan = $this->getStudienPlanFromPrestudentStatus(getAuthPersonId())->studienplan_id;
 
-			$parameter_studiensemester = $parameter_studiensemester ?? $student_studiensemester;
-			$parameter_studiengang = $parameter_studiengang ?? $student_studiengang;
-			$parameter_semester = $parameter_semester ?? $student_semester;
-			$parameter_studienplan = $parameter_studienplan ?? $student_studienplan;
+		if($this->getDataOrTerminateWithError($this->StudentModel->isStudent(getAuthUID()))){
+			$studentLehrverband =$this->StudentlehrverbandModel->loadWhere(["student_uid" => getAuthUID(), "studiensemester_kurzbz" => $aktuelles_studiensemester->studiensemester_kurzbz]);
+			$studentLehrverband = current($this->getDataOrTerminateWithError($studentLehrverband));
+			
+			$student_studiensemester = $studentLehrverband->studiensemester_kurzbz;
+			$student_studiengang = $studentLehrverband->studiengang_kz;
+			$student_semester = $studentLehrverband->semester;
+			$student_studienplan = $this->getStudienPlanFromPrestudentStatus(getAuthPersonId())->studienplan_id;
+			
+			if(!isset($parameter_studiensemester))
+			$parameter_studiensemester = $student_studiensemester;
+			if(!isset($parameter_studiengang))
+			$parameter_studiengang = $student_studiengang;
+			if(!isset($parameter_semester))
+			$parameter_semester = $student_semester;
+			if(!isset($parameter_studienplan))
+			$parameter_studienplan = $student_studienplan;
 		}  
 
 		if(isset($parameter_studiensemester)){

application/controllers/api/frontend/v1/lv/Gruppe.php

@@ -12,8 +12,8 @@ class Gruppe extends FHCAPI_Controller
 			'add' => ['admin:rw', 'assistenz:rw'],
 			'delete' => ['admin:rw', 'assistenz:rw'],
 			'deleteFromLVPlan' => ['admin:rw', 'assistenz:rw'],
-			'getBenutzerSearch' => ['admin:r', 'assistenz:r'],
-			'getAllSearch' => ['admin:r', 'assistenz:r'],
+			'getBenutzer' => ['admin:r', 'assistenz:r'],
+			'getAll' => ['admin:r', 'assistenz:r'],
 			'getByLehreinheit' => ['admin:r', 'assistenz:r'],
 		]);
 
@@ -22,8 +22,7 @@ class Gruppe extends FHCAPI_Controller
 		$this->_ci->load->library('PhrasesLib');
 		$this->loadPhrases(
 			array(
-				'ui',
-				'lehre'
+				'ui'
 			)
 		);
 
@@ -92,11 +91,11 @@ class Gruppe extends FHCAPI_Controller
 		$lehreinheitgruppe_id = $this->input->post('lehreinheitgruppe_id');
 
 		if (is_null($lehreinheit_id) || !ctype_digit((string)$lehreinheit_id) || is_null($lehreinheitgruppe_id) || !ctype_digit((string)$lehreinheitgruppe_id))
-			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError( $this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
 
 		$lehreinheitgruppe_result = $this->_ci->LehreinheitgruppeModel->loadWhere(array('lehreinheitgruppe_id' => $lehreinheitgruppe_id));
 		if (!hasData($lehreinheitgruppe_result) || isError($lehreinheitgruppe_result))
-			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError( $this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
 
 		$this->checkPermission($lehreinheit_id);
 
@@ -109,33 +108,15 @@ class Gruppe extends FHCAPI_Controller
 	}
 
 
-	public function getAllSearch()
+	public function getAll()
 	{
-		$query = $this->input->get('query');
-
-		if (is_null($query))
-			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
-
-		$query_words = explode(' ', $query);
-
 		$this->_ci->GruppeModel->addSelect('gruppe_kurzbz,
 											studiengang_kz,
 											semester,
 											bezeichnung,
 											gid,
 											\'false\' as lehrverband');
-		$this->_ci->GruppeModel->db->where(array('sichtbar' => true, 'aktiv' => true, 'lehre' => true, 'direktinskription' => false, 'semester IS NOT NULL' => null));
-		$this->_ci->GruppeModel->db->group_start();
-		foreach ($query_words as $word)
-		{
-			$this->_ci->GruppeModel->db->group_start();
-			$this->_ci->GruppeModel->db->where('gruppe_kurzbz ILIKE', "%" . $word . "%");
-			$this->_ci->GruppeModel->db->or_where('bezeichnung ILIKE', "%" . $word . "%");
-			$this->_ci->GruppeModel->db->group_end();
-		}
-		$this->_ci->GruppeModel->db->group_end();
-
-		$gruppen_result = $this->_ci->GruppeModel->load();
+		$gruppen_result = $this->_ci->GruppeModel->loadWhere(array('sichtbar' => true, 'aktiv' => true, 'lehre' => true, 'direktinskription' => false, 'semester IS NOT NULL' => null));
 
 		$gruppen_array = array();
 
@@ -154,18 +135,7 @@ class Gruppe extends FHCAPI_Controller
 		$this->_ci->LehrverbandModel->addJoin('public.tbl_studiengang', 'studiengang_kz');
 		$this->_ci->LehrverbandModel->addOrder('verband');
 		$this->_ci->LehrverbandModel->addOrder('gruppe');
-		$this->_ci->LehrverbandModel->db->where(array('tbl_lehrverband.aktiv' => true));
-
-		$this->_ci->LehrverbandModel->db->group_start();
-		foreach ($query_words as $word)
-		{
-			$this->_ci->LehrverbandModel->db->group_start();
-			$this->_ci->LehrverbandModel->db->where('CONCAT(CONCAT(typ, kurzbz), \'\', semester, verband, COALESCE(gruppe,\'\')) ILIKE', "%" . $word . "%");
-			$this->_ci->LehrverbandModel->db->or_where('tbl_lehrverband.bezeichnung ILIKE', "%" . $word . "%");
-			$this->_ci->LehrverbandModel->db->group_end();
-		}
-		$this->_ci->LehrverbandModel->db->group_end();
-		$lehrverband_result = $this->_ci->LehrverbandModel->load();
+		$lehrverband_result = $this->_ci->LehrverbandModel->loadWhere(array('tbl_lehrverband.aktiv' => true));
 
 		$lehrverband_array = array();
 
@@ -180,40 +150,15 @@ class Gruppe extends FHCAPI_Controller
 		$this->terminateWithSuccess($all_gruppen);
 	}
 
-	public function getBenutzerSearch()
+	public function getBenutzer()
 	{
-		$query = $this->input->get('query');
-
-		if (is_null($query))
-			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
-
-		$query_words = explode(' ', $query);
-
 		$this->_ci->PersonModel->addSelect('vorname, nachname, uid, semester, UPPER(CONCAT(tbl_studiengang.typ, tbl_studiengang.kurzbz)) as studiengang');
 		$this->_ci->PersonModel->addJoin('public.tbl_benutzer', 'person_id');
 		$this->_ci->PersonModel->addJoin('public.tbl_mitarbeiter', 'uid = mitarbeiter_uid', 'LEFT');
 		$this->_ci->PersonModel->addJoin('public.tbl_student', 'uid = student_uid', 'LEFT');
 		$this->_ci->PersonModel->addJoin('public.tbl_studiengang', 'studiengang_kz', 'LEFT');
 
-		$this->_ci->PersonModel->db->where(array('tbl_benutzer.aktiv' => true));
-
-		$this->_ci->PersonModel->db->group_start();
-		foreach ($query_words as $word)
-		{
-			$this->_ci->PersonModel->db->group_start();
-			$this->_ci->PersonModel->db->where('tbl_person.vorname ILIKE', "%" . $word . "%");
-			$this->_ci->PersonModel->db->or_where('tbl_person.nachname ILIKE', "%" . $word . "%");
-			$this->_ci->PersonModel->db->or_where('uid ILIKE', "%" . $word . "%");
-			$this->_ci->PersonModel->db->or_where('CONCAT(tbl_studiengang.typ, tbl_studiengang.kurzbz) ILIKE', "%" . $word . "%");
-
-			if (is_numeric($word))
-			{
-				$this->_ci->PersonModel->db->or_where('semester', $word);
-			}
-			$this->_ci->PersonModel->db->group_end();
-		}
-		$this->_ci->PersonModel->db->group_end();
-		$personen = $this->_ci->PersonModel->load();
+		$personen = $this->_ci->PersonModel->loadWhere(array('tbl_benutzer.aktiv' => true));
 		$this->terminateWithSuccess(hasData($personen) ? getData($personen) : array());
 	}
 

application/controllers/api/frontend/v1/lv/Lehreinheit.php

@@ -169,10 +169,6 @@ class Lehreinheit extends FHCAPI_Controller
 		{
 			$value = $this->input->post($field);
 
-			if ($field === 'lehre')
-			{
-				$value = (bool)$value;
-			}
 			if ($value !== null)
 			{
 				$updateData[$field] = $value;
@@ -285,43 +281,15 @@ class Lehreinheit extends FHCAPI_Controller
 	public function delete()
 	{
 		$lehreinheit_id = $this->input->post('lehreinheit_id');
+		$lehreinheit = $this->checkLehreinheit($lehreinheit_id);
+		$this->checkPermission($lehreinheit->lehreinheit_id);
 
-		$errors = array();
-		if (is_array($lehreinheit_id))
-		{
-			foreach ($lehreinheit_id as $le_id)
-			{
-				$lehreinheit = $this->checkLehreinheit($le_id);
-				$this->checkPermission($lehreinheit->lehreinheit_id);
+		$result = $this->_ci->LehreinheitModel->deleteLehreinheit($lehreinheit->lehreinheit_id);
 
-				$result = $this->_ci->LehreinheitModel->deleteLehreinheit($lehreinheit->lehreinheit_id);
+		if (isError($result))
+			$this->terminateWithValidationErrors(getError($result));
 
-				if (isError($result))
-				{
-					$errors[] = getError($result);
-				}
-			}
-		}
-		else
-		{
-			$lehreinheit = $this->checkLehreinheit($lehreinheit_id);
-			$this->checkPermission($lehreinheit->lehreinheit_id);
-
-			$result = $this->_ci->LehreinheitModel->deleteLehreinheit($lehreinheit->lehreinheit_id);
-
-			if (isError($result))
-				$this->terminateWithError(getError($result));
-		}
-
-		if (!isEmptyArray($errors))
-		{
-			if (count($errors) !== count($lehreinheit_id))
-				$this->terminateWithSuccess(array('errors' => $errors));
-			else
-				$this->terminateWithError($errors);
-		}
-		else
-			$this->terminateWithSuccess('Erfolgreich geloescht');
+		$this->terminateWithSuccess('Erfolgreich geloescht');
 	}
 
 	public function update()

application/controllers/api/frontend/v1/lv/Lektor.php

@@ -15,7 +15,7 @@ class Lektor extends FHCAPI_Controller
 			'deleteLVPlan' => ['admin:rw', 'assistenz:rw'],
 			'deletePerson' => ['admin:rw', 'assistenz:rw'],
 			'getLehrfunktionen' => ['admin:r', 'assistenz:r'],
-			'getLektorenSearch' => ['admin:r', 'assistenz:r'],
+			'getLektoren' => ['admin:r', 'assistenz:r'],
 			'getLektorenByLE' => ['admin:r', 'assistenz:r'],
 			'getLektorDaten' => ['admin:r', 'assistenz:r'],
 			'getLektorVertrag' => ['admin:r', 'assistenz:r'],
@@ -208,35 +208,12 @@ class Lektor extends FHCAPI_Controller
 		$this->terminateWithSuccess(getData($this->_ci->LehrfunktionModel->load()));
 	}
 
-	public function getLektorenSearch()
+	public function getLektoren()
 	{
-		$query = $this->input->get('query');
-
-		if (is_null($query))
-			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
-
-		$query_words = explode(' ', $query);
-
 		$this->_ci->MitarbeiterModel->addSelect('uid, person_id, vorname, nachname');
 		$this->_ci->MitarbeiterModel->addJoin('public.tbl_benutzer', 'uid = mitarbeiter_uid');
 		$this->_ci->MitarbeiterModel->addJoin('public.tbl_person', 'person_id');
-
-		$this->_ci->MitarbeiterModel->db->where('public.tbl_benutzer.aktiv', true);
-
-		$this->_ci->MitarbeiterModel->db->group_start();
-		foreach ($query_words as $word)
-		{
-			$this->_ci->MitarbeiterModel->db->group_start();
-			$this->_ci->MitarbeiterModel->db->where('tbl_person.vorname ILIKE', "%" . $word . "%");
-			$this->_ci->MitarbeiterModel->db->or_where('tbl_person.nachname ILIKE', "%" . $word . "%");
-			$this->_ci->MitarbeiterModel->db->or_where('uid ILIKE', "%" . $word . "%");
-			$this->_ci->MitarbeiterModel->db->group_end();
-		}
-		$this->_ci->MitarbeiterModel->db->group_end();
-		$this->_ci->MitarbeiterModel->addOrder('nachname');
-		$this->_ci->MitarbeiterModel->addOrder('vorname');
-		$result = $this->_ci->MitarbeiterModel->load();
-		$this->terminateWithSuccess(hasData($result) ? getData($result) : array());
+		$this->terminateWithSuccess(getData($this->_ci->MitarbeiterModel->loadWhere(array('public.tbl_benutzer.aktiv' => true))));
 	}
 
 	private function checkLehreinheit($lehreinheit_id)

application/controllers/api/frontend/v1/lv/Tags.php

@@ -5,7 +5,7 @@ if (!defined('BASEPATH'))
 
 class Tags extends Tag_Controller
 {
-	const BERECHTIGUNG_KURZBZ = ['admin:rw', 'assistenz:r'];
+	const BERECHTIGUNG_KURZBZ = ['admin:rw', 'assistenz:rw'];
 
 	public function __construct()
 	{

application/controllers/api/frontend/v1/messages/Messages.php

@@ -1,5 +1,6 @@
 <?php
 
+
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
 class Messages extends FHCAPI_Controller
@@ -13,15 +14,13 @@ class Messages extends FHCAPI_Controller
 			'getMsgVarsPrestudent' => ['admin:r', 'assistenz:r'],
 			'getMsgVarsLoggedInUser' => ['admin:r', 'assistenz:r'],
 			'getNameOfDefaultRecipient' => ['admin:r', 'assistenz:r'],
-			'getNameOfDefaultRecipients' => ['admin:r', 'assistenz:r'],
 			'sendMessage' => ['admin:r', 'assistenz:r'],
 			'deleteMessage' => ['admin:r', 'assistenz:r'],
-			'getDataVorlage' => ['admin:r', 'assistenz:r'],
+			'getVorlagentext' => ['admin:r', 'assistenz:r'],
 			'getPreviewText' => ['admin:r', 'assistenz:r'],
 			'getReplyData' => ['admin:r', 'assistenz:r'],
 			'getPersonId' => ['admin:r', 'assistenz:r'],
 			'getUid' => ['admin:r', 'assistenz:r'],
-			'getUids' => ['admin:r', 'assistenz:r'],
 		]);
 
 		//Load Models
@@ -38,7 +37,7 @@ class Messages extends FHCAPI_Controller
 
 		// Load language phrases
 		$this->loadPhrases([
-			'ui', 'messages'
+			'ui'
 		]);
 	}
 
@@ -53,14 +52,11 @@ class Messages extends FHCAPI_Controller
 
 		$result = $this->MessageModel->getMessagesForTable($id, $offset, $limit);
 
-		if (hasData($result))
-		{
-			$data = getData($result);
-			$this->addMeta('count', $data['count']);
-			$this->terminateWithSuccess($data['data']);
-		}
+		$data = $this->getDataOrTerminateWithError($result);
 
-		$this->terminateWithSuccess(array());
+		$this->addMeta('count', $data['count']);
+
+		$this->terminateWithSuccess($data['data']);
 	}
 
 	public function getVorlagen()
@@ -70,23 +66,33 @@ class Messages extends FHCAPI_Controller
 		$this->load->model('person/Benutzerfunktion_model', 'BenutzerfunktionModel');
 		$result = $this->BenutzerfunktionModel->getBenutzerfunktionByUid($uid, 'oezuordnung');
 
-		if (hasData($result))
-		{
-			$this->load->model('system/Vorlage_model', 'VorlageModel');
+		$data = $this->getDataOrTerminateWithError($result);
+		$oe_kurzbz = current($data);
 
-			$data = getData($result);
+		$this->load->model('system/Vorlage_model', 'VorlageModel');
 
-			$oe_kurzbz = array_column($data, 'oe_kurzbz');
-			$result = $this->VorlageModel->getAllVorlagenByOe($oe_kurzbz);
+		$result = $this->VorlageModel->getAllVorlagenByOe($oe_kurzbz->oe_kurzbz);
+		$data = $this->getDataOrTerminateWithError($result);
 
-			$this->terminateWithSuccess(hasData($result) ? getData($result) : array());
-		}
+		$this->terminateWithSuccess($data);
 
-		$this->terminateWithSuccess(array());
+		//If admin
+		$this->VorlageModel->addOrder('vorlage_kurzbz', 'ASC');
+		$result = $this->VorlageModel->loadWhere(
+			array(
+				'mimetype' => 'text/html'
+			));
+
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
 	}
 
-	public function getDataVorlage($vorlage_kurzbz)
+	public function getVorlagentext($vorlage_kurzbz)
 	{
+		//$this->terminateWithError("vor " . $vorlage_kurzbz, self::ERROR_TYPE_GENERAL);
+		//$studiengang_kz = 227; //TODO(Manu) dynamisieren NULL
 		$studiengang_kz = 0;
 		$this->load->model('system/Vorlagestudiengang_model', 'VorlagestudiengangModel');
 		$this->VorlagestudiengangModel->addOrder('version', 'DESC');
@@ -98,53 +104,30 @@ class Messages extends FHCAPI_Controller
 			]);
 
 		$data = $this->getDataOrTerminateWithError($result);
+
+		//not correct with Vorlage
 		$vorlage = current($data);
-		$this->terminateWithSuccess($vorlage);
+
+		//$this->terminateWithSuccess($data);
+		$this->terminateWithSuccess($vorlage->text);
 	}
 
-	public function getMessageVarsPerson($typeId)
+	public function getMessageVarsPerson($id, $typeId)
 	{
-		$ids = $this->input->post('ids');
-		$messageVarsPerson = [];
+		$person_id = ($typeId == 'mitarbeiter_uid') ? $this->_getPersonId($id, $typeId) : $id;
+		$result = $this->MessageModel->getMsgVarsDataByPersonId($person_id);
+		$data = $this->getDataOrTerminateWithError($result);
 
-		foreach ($ids as $id)
-		{
-			$person_id = ($typeId == 'mitarbeiter_uid') ? $this->_getPersonId($id, $typeId) : $id;
-			$result = $this->MessageModel->getMsgVarsDataByPersonId($person_id);
-			$data = $this->getDataOrTerminateWithError($result);
-			$messageVarsPerson[] = current($data);
-		}
-
-		$this->terminateWithSuccess($messageVarsPerson);
+		$this->terminateWithSuccess($data);
 	}
 
-	public function getMsgVarsPrestudent($typeId)
+	public function getMsgVarsPrestudent($id, $typeId)
 	{
-		$ids = $this->input->post('ids');
-		if(!is_array($ids)) {
-			$ids = array($ids);
-		}
-		$messageVarsPrestudent = [];
+		$prestudent_id = ($typeId == 'uid') ? $this->_getPrestudentIdFromUid($id) : $id;
+		$result = $this->MessageModel->getMsgVarsDataByPrestudentId($prestudent_id);
+		$data = $this->getDataOrTerminateWithError($result);
 
-		if($typeId == 'uid')
-		{
-			$prestudent_ids = [];
-			foreach ($ids as $id)
-			{
-				$prestudent_ids[] =  $this->_getPrestudentIdFromUid($id);
-			}
-		}
-		else
-			$prestudent_ids = $ids;
-
-		foreach ($prestudent_ids as $prestudent_id)
-		{
-			$result = $this->MessageModel->getMsgVarsDataByPrestudentId($prestudent_id);
-			$data = $this->getDataOrTerminateWithError($result);
-			$messageVarsPrestudent[] = current($data);
-		}
-
-		$this->terminateWithSuccess($messageVarsPrestudent);
+		$this->terminateWithSuccess($data);
 	}
 
 	public function getMsgVarsLoggedInUser()
@@ -155,45 +138,27 @@ class Messages extends FHCAPI_Controller
 		$this->terminateWithSuccess($data);
 	}
 
-	public function getNameOfDefaultRecipients($type_id)
+	public function getNameOfDefaultRecipient($id, $type_id)
 	{
-		$ids = $this->input->post('ids');
-		if(!is_array($ids)) {
-			$ids = array($ids);
-		}
-		$recipients = [];
-
-		if (empty($ids)) {
-
-			throw new InvalidArgumentException($this->p->t('ui', 'errorMissingOrInvalidParameters', ['parameter'=> 'Id(s)']), self::ERROR_TYPE_GENERAL);
-		}
+		$id = ($type_id != 'person_id') ? $this->_getPersonId($id, $type_id) : $id;
 
 		$this->load->model('person/Person_model', 'PersonModel');
-		if($type_id != 'person_id'){
-			foreach ($ids as $id)
-			{
-				$person_id =  $this->_getPersonId($id, $type_id);
-				$result = $this->PersonModel->load($person_id);
-				$data = $this->getDataOrTerminateWithError($result);
-				$name = current($data);
-				$recipients[$id] = $name->vorname . " " . $name->nachname;
-			}
-		}
-		else {
-			foreach ($ids as $id) {
-				$result = $this->PersonModel->load($id);
-				$data = $this->getDataOrTerminateWithError($result);
-				$name = current($data);
-				$recipients[$id] = $name->vorname . " " . $name->nachname;
-			}
-		}
 
-		$this->terminateWithSuccess($recipients);
+		$result = $this->PersonModel->load($id);
+		$data = $this->getDataOrTerminateWithError($result);
+		$name = current($data);
+
+		$this->terminateWithSuccess($name->vorname . " " . $name->nachname );
 	}
 
-	public function sendMessage($typeId)
+	public function sendMessage($recipient_id)
 	{
-		$resultReturn = [];
+		//has to be uid
+	//	$this->terminateWithError("uid", $recipient_id, self::ERROR_TYPE_GENERAL);
+
+		//default setting
+		$receiversPersonId = $this->_getPersonId($recipient_id, 'uid');
+
 		$uid = getAuthUID();
 		$this->load->model('person/Benutzer_model', 'BenutzerModel');
 		$result = $this->BenutzerModel->loadWhere(
@@ -231,61 +196,49 @@ class Messages extends FHCAPI_Controller
 		$body = $this->input->post('body');
 		$relationmessage_id = $this->input->post('relationmessage_id');
 
-		if (isset($_POST['ids']))
+		$typeId = $this->input->post('type_id');
+		$id = $this->input->post('id');
+
+		if($typeId == 'uid')
 		{
-			$ids = json_decode($_POST['ids']);
-			unset($_POST['ids']);
-			foreach ($data as $k => $v) {
-				$_POST[$k] = $v;
-			}
-		}
+			$prestudent_id = $this-> _getPrestudentIdFromUid($id);
 
-		if (!is_array($ids)) {
-			$ids = [$ids];
+			//parseMessagetext for variables Prestudent
+			$result = $this->MessagesModel->parseMessageTextPrestudent($prestudent_id, $body);
+			$bodyParsed = $this->getDataOrTerminateWithError($result);
 		}
-
-		foreach ($ids as $id)
+		if($typeId == 'mitarbeiter_uid')
 		{
-			$receiversPersonId = $typeId == "person_id" ? $id : $this->_getPersonId($id, $typeId);
+			$person_id = $this->_getPersonId($id, $typeId);
 
-			if($typeId == 'uid')
-			{
-				$prestudent_id = $this-> _getPrestudentIdFromUid($id);
-
-				$result = $this->MessagesModel->parseMessageTextPrestudent($prestudent_id, $body);
-				$bodyParsed = $this->getDataOrTerminateWithError($result);
-			}
-			if($typeId == 'mitarbeiter_uid')
-			{
-				$person_id = $this->_getPersonId($id, $typeId);
-
-				$result = $this->MessagesModel->parseMessageTextPerson($person_id, $body);
-				$bodyParsed = $this->getDataOrTerminateWithError($result);
-			}
-			elseif($typeId == 'person_id')
-			{
-				$result = $this->MessagesModel->parseMessageTextPerson($id, $body);
-				$bodyParsed = $this->getDataOrTerminateWithError($result);
-			}
-			elseif($typeId == 'prestudent_id')
-			{
-				$result = $this->MessagesModel->parseMessageTextPrestudent($id, $body);
-				$bodyParsed = $this->getDataOrTerminateWithError($result);
-			}
-			else
-			{
-				$this->terminateWithError($this->p->t('messages', 'error_missingLogic', ['type'=> $typeId]), self::ERROR_TYPE_GENERAL);
-			}
-
-			$result =$this->messagelib->sendMessageUser($receiversPersonId, $subject, $bodyParsed, $benutzer->person_id, null, $relationmessage_id);
-			$data = $this->getDataOrTerminateWithError($result);
-			$resultReturn[] = current($data);
+			$result = $this->MessagesModel->parseMessageTextPerson($person_id, $body);
+			$bodyParsed = $this->getDataOrTerminateWithError($result);
+			$this->terminateWithError($bodyParsed, self::ERROR_TYPE_GENERAL);
 
 		}
-		$this->terminateWithSuccess($resultReturn);
+		elseif($typeId == 'person_id')
+		{
+			$result = $this->MessagesModel->parseMessageTextPerson($id, $body);
+			$bodyParsed = $this->getDataOrTerminateWithError($result);
+		}
+		elseif($typeId == 'prestudent_id')
+		{
+		//	$this->terminateWithError("prestudent_id ", self::ERROR_TYPE_GENERAL);
+
+			$result = $this->MessagesModel->parseMessageTextPrestudent($id, $body);
+			$bodyParsed = $this->getDataOrTerminateWithError($result);
+		}
+		else
+		{
+			$this->terminateWithError("type_id " . $typeId . " not valid", self::ERROR_TYPE_GENERAL);
+		}
+
+		$result = $this->messagelib->sendMessageUser($receiversPersonId, $subject, $bodyParsed, $benutzer->person_id, null, $relationmessage_id);
+
+		$this->terminateWithSuccess($result);
 	}
 
-	public function getPreviewText($type_id)
+	public function getPreviewText($id, $type_id)
 	{
 		if (isset($_POST['data']))
 		{
@@ -293,60 +246,39 @@ class Messages extends FHCAPI_Controller
 			unset($_POST['data']);
 		}
 		else
-			$this->terminateWithError($this->p->t('messages', 'errorMissingOrInvalidParameters', ['parameter'=> "Textbody"]), self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError("Textbody missing ", self::ERROR_TYPE_GENERAL);
 
-		if (isset($_POST['ids']))
+		switch($type_id)
 		{
-			$ids = json_decode($_POST['ids']);
-			if(!is_array($ids))
-			{
-				$ids = array($ids);
-			}
-			unset($_POST['ids']);
+			case 'uid':
+				$prestudent_id = $this->_getPrestudentIdFromUid($id);
+				$result = $this->MessagesModel->parseMessageTextPrestudent($prestudent_id, $data);
+				break;
+			case 'prestudent_id':
+				$result = $this->MessagesModel->parseMessageTextPrestudent($id, $data);
+				break;
+			case 'person_id':
+				$result = $this->MessagesModel->parseMessageTextPerson($id, $data);
+				break;
+			case 'mitarbeiter_uid':
+				{
+					$person_id = $this->_getPersonId($id, $type_id);
+					$result = $this->MessagesModel->parseMessageTextPerson($person_id, $data);
+				}
+				break;
+			default:
+				$this->terminateWithError("MESSAGES::getPreviewText logic for type_id " . $type_id . " not defined yet", self::ERROR_TYPE_GENERAL);
+				break;
 		}
-		else
-			$this->terminateWithError($this->p->t('ui', 'errorMissingOrInvalidParameters', ['parameter'=> 'Id(s)']), self::ERROR_TYPE_GENERAL);
 
-		$bodyParsed = [];
-
-		foreach ($ids as $id)
-		{
-			switch($type_id)
-			{
-				case 'uid':
-					$prestudent_id = $this->_getPrestudentIdFromUid($id);
-					$result = $this->MessagesModel->parseMessageTextPrestudent($prestudent_id, $data);
-					$bodyParsed[$id] = $this->getDataOrTerminateWithError($result);
-					break;
-				case 'prestudent_id':
-					$result = $this->MessagesModel->parseMessageTextPrestudent($id, $data);
-					$bodyParsed[$id] = $this->getDataOrTerminateWithError($result);
-					break;
-				case 'person_id':
-					$result = $this->MessagesModel->parseMessageTextPerson($id, $data);
-					$bodyParsed[$id] = $this->getDataOrTerminateWithError($result);
-					break;
-				case 'mitarbeiter_uid':
-					{
-						$person_id = $this->_getPersonId($id, $type_id);
-						$result = $this->MessagesModel->parseMessageTextPerson($person_id, $data);
-						$bodyParsed[$id] = $this->getDataOrTerminateWithError($result);
-					}
-					break;
-				default:
-					$this->terminateWithError($this->p->t('messages', 'error_missingLogic', ['type'=> $type_id]), self::ERROR_TYPE_GENERAL);
-					break;
-			}
-		}
+		$bodyParsed = $this->getDataOrTerminateWithError($result);
 
 		$this->terminateWithSuccess($bodyParsed);
 	}
 
 	public function getReplyData($messageId)
 	{
-		if (!is_numeric($messageId)) {
-			$this->terminateWithError($this->p->t('ui', 'error_valueNotNumeric', ['value'=> 'Message ID']), self::ERROR_TYPE_GENERAL);
-		}
+		//TODO(Manu) validation of messageId: if number
 
 		$this->MessageModel->addSelect('public.tbl_msg_message.*');
 		$this->MessageModel->addSelect('r.*');
@@ -369,6 +301,7 @@ class Messages extends FHCAPI_Controller
 		$replyBody = $this->_getReplyBody($body, $dataMessage[0]->nachname, $dataMessage[0]->vorname, $dataMessage[0]->insertamum);
 
 		$dataMessage[0]->replyBody = $replyBody;
+		$dataMessage[0]->rest = "Help Manu";
 		$dataMessage[0]->replySubject = $prefix . $subject;
 
 		$this->terminateWithSuccess($dataMessage);
@@ -416,11 +349,6 @@ class Messages extends FHCAPI_Controller
 				['prestudent_id' => $id]
 			);
 		}
-		else
-		{
-			$this->terminateWithError($this->p->t('messages', 'error_missingLogic', ['type'=> $typeId]), self::ERROR_TYPE_GENERAL);
-		}
-
 
 		$data = $this->getDataOrTerminateWithError($result);
 		$person = current($data);
@@ -428,11 +356,8 @@ class Messages extends FHCAPI_Controller
 		$this->terminateWithSuccess($person->person_id);
 	}
 
-	public function getUids($typeId)
+	public function getUid($id, $typeId)
 	{
-		$ids = $this->input->post('ids');
-		$benutzerIds = [];
-
 		if (!$typeId)
 		{
 			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Type ID']), self::ERROR_TYPE_GENERAL);
@@ -440,50 +365,39 @@ class Messages extends FHCAPI_Controller
 		elseif ($typeId == 'person_id')
 		{
 			$this->load->model('person/Benutzer_model', 'BenutzerModel');
-			foreach ($ids as $id)
-			{
-				$result = $this->BenutzerModel->loadWhere(
-					['person_id' => $id]
-				);
-				$data = $this->getDataOrTerminateWithError($result);
-				$benutzer = current($data);
-
-				$benutzerIds[$id] = $benutzer->uid;
-			}
+			$result = $this->BenutzerModel->loadWhere(
+				['person_id' => $id]
+			);
 		}
 		elseif($typeId == 'prestudent_id')
 		{
 			$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-			foreach ($ids as $id)
-			{
-				$result = $this->PrestudentModel->loadWhere(
-					['prestudent_id' => $id]
-				);
+			$result = $this->PrestudentModel->loadWhere(
+				['prestudent_id' => $id]
+			);
 
-				$data = $this->getDataOrTerminateWithError($result);
-				$person = current($data);
-				$person_id = $person->person_id;
+			$data = $this->getDataOrTerminateWithError($result);
+			$person = current($data);
+			$person_id = $person->person_id;
 
-				$this->load->model('person/Benutzer_model', 'BenutzerModel');
-				$result = $this->BenutzerModel->loadWhere(
-					['person_id' => $person_id]
-				);
-				$data = $this->getDataOrTerminateWithError($result);
-				$benutzer = current($data);
-
-				$benutzerIds[$id] = $benutzer->uid;
-			}
+			$this->load->model('person/Benutzer_model', 'BenutzerModel');
+			$result = $this->BenutzerModel->loadWhere(
+				['person_id' => $person_id]
+			);
 		}
 		elseif($typeId == 'uid' || $typeId == 'mitarbeiter_uid')
 		{
-			$this->terminateWithSuccess($ids);
+			$this->terminateWithSuccess($id);
 		}
 		else
 		{
-			$this->terminateWithError($this->p->t('messages', 'error_missingLogic', ['type'=> $typeId]), self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError("MESSAGES::getUID logic for type_id " . $typeId . " not defined yet", self::ERROR_TYPE_GENERAL);
 		}
 
-		$this->terminateWithSuccess($benutzerIds);
+		$data = $this->getDataOrTerminateWithError($result);
+		$benutzer = current($data);
+
+		$this->terminateWithSuccess($benutzer->uid);
 	}
 
 	private function _getPersonId($id, $typeId)
@@ -502,16 +416,11 @@ class Messages extends FHCAPI_Controller
 				['prestudent_id' => $id]
 			);
 		}
-		else
-		{
-			$this->terminateWithError($this->p->t('messages', 'error_missingLogic', ['type'=> $typeId]), self::ERROR_TYPE_GENERAL);
-		}
-
 
 		$data = $this->getDataOrTerminateWithError($result);
 		if (count($data) < 1)
 		{
-			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Person ID']), self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError('Error: Messages API no person_id found.');
 		}
 		$person = current($data);
 
@@ -520,6 +429,7 @@ class Messages extends FHCAPI_Controller
 
 	private function _getPrestudentIdFromUid($uid)
 	{
+	//	$this->terminateWithError($uid, self::ERROR_TYPE_GENERAL);
 		$this->load->model('crm/Student_model', 'StudentModel');
 		$result = $this->StudentModel->loadWhere(
 			['student_uid' => $uid]
@@ -528,7 +438,7 @@ class Messages extends FHCAPI_Controller
 		$data = $this->getDataOrTerminateWithError($result);
 		if (count($data) < 1)
 		{
-			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Prestudent ID']), self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError('Error: Messages API no prestudent_id found.');
 		}
 		$student = current($data);
 
@@ -553,4 +463,4 @@ class Messages extends FHCAPI_Controller
 			date_format(date_create($sentDate), 'd.m.Y H:i'), $receiverName, $receiverSurname, $body
 		);
 	}
-}
+}

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

@@ -1,69 +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 Studienplan extends FHCAPI_Controller
-{
-	public function __construct()
-	{
-		// TODO(chris): access!
-		parent::__construct([
-			'getBySemester' => self::PERM_LOGGED
-		]);
-	}
-
-	public function getBySemester()
-	{
-		$this->load->model('organisation/Studienplan_model', 'StudienplanModel');
-
-		$studiengang_kz = $this->input->get('studiengang_kz');
-		$studiensemester_kurzbz = $this->input->get('studiensemester_kurzbz');
-		$ausbildungssemester = $this->input->get('ausbildungssemester') ?: null;
-		$orgform_kurzbz = $this->input->get('orgform_kurzbz') ?: null;
-
-		if (!$studiengang_kz || !is_numeric($studiengang_kz))
-			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Studiengangskennzahl']), self::ERROR_TYPE_GENERAL);
-
-		if (!$studiensemester_kurzbz)
-			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Studiensemester']), self::ERROR_TYPE_GENERAL);
-
-		if (isset($ausbildungssemester) && !is_numeric($ausbildungssemester))
-			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Ausbildungssemester']), self::ERROR_TYPE_GENERAL);
-
-
-		//~ $this->load->library('form_validation');
-		
-		//~ $this->form_validation->set_rules('studiengang_kz', 'StudiengangKz', 'required|numeric');
-		//~ $this->form_validation->set_rules('studiensemester_kurzbz', 'StudiensemesterKurbz', 'required');
-		//~ $this->form_validation->set_rules('ausbildungssemester', 'Ausbildungssemester', 'numeric');
-
-		//~ if (!$this->form_validation->run())
-		//~ {
-			//~ $this->addMeta('fail2', 'fail2');
-			//~ return $this->terminateWithValidationErrors($this->form_validation->error_array());
-		//~ }
-
-
-		$this->addMeta('stg_kz', $studiengang_kz);
-		$this->addMeta('sem', $studiensemester_kurzbz);
-		$this->addMeta('sem2', $ausbildungssemester);
-		$this->addMeta('org', $orgform_kurzbz);
-
-		$result = $this->StudienplanModel->getStudienplaeneBySemester($studiengang_kz, $studiensemester_kurzbz, $ausbildungssemester, $orgform_kurzbz);
-		if (isError($result)) $this->terminateWithError(getError($result), self::ERROR_TYPE_DB);
-
-		$this->terminateWithSuccess(hasData($result) ? getData($result) : []);
-	}
-}

application/controllers/api/frontend/v1/stv/Abschlusspruefung.php

@@ -20,6 +20,8 @@ class Abschlusspruefung extends FHCAPI_Controller
 			'getBeurteilungen' => ['admin:rw', 'assistenz:rw'],
 			'getAkadGrade' => ['admin:rw', 'assistenz:rw'],
 			'getMitarbeiter' => ['admin:rw', 'assistenz:rw'],
+			'getAllMitarbeiter' => ['admin:rw', 'assistenz:rw'],
+			'getAllPersons' => ['admin:rw', 'assistenz:rw'],
 			'getPruefer' => ['admin:rw', 'assistenz:rw'],
 			'getTypStudiengang' => ['admin:rw', 'assistenz:rw'],
 			'checkForExistingExams' => ['admin:rw', 'assistenz:rw'],
@@ -100,45 +102,35 @@ class Abschlusspruefung extends FHCAPI_Controller
 	{
 		$abschlusspruefung_id = $this->input->post('id');
 
-		$this->AbschlusspruefungModel->addSelect(
-			'lehre.tbl_abschlusspruefung.*,
-			p1.person_id AS p1_person_id, p1.vorname AS p1_vorname, p1.nachname AS p1_nachname,
-			p1.titelpre AS p1_titelpre, p1.titelpost AS p1_titelpost,
-			p2.person_id AS p2_person_id, p2.vorname AS p2_vorname, p2.nachname AS p2_nachname,
-			p2.titelpre AS p2_titelpre, p2.titelpost AS p2_titelpost,
-			p3.person_id AS p3_person_id, p3.vorname AS p3_vorname, p3.nachname AS p3_nachname,
-			p3.titelpre AS p3_titelpre, p3.titelpost AS p3_titelpost,
-			pv.person_id AS pv_person_id, pv.vorname AS pv_vorname, pv.nachname AS pv_nachname,
-			pv.titelpre AS pv_titelpre, pv.titelpost AS pv_titelpost, ben.uid AS pv_uid'
-		);
-		//~ $this->AbschlusspruefungModel->addSelect("
-			//~ CASE
-				//~ WHEN pruefer1 IS NOT NULL
-				//~ THEN CONCAT(p1.nachname, ' ', p1.vorname, COALESCE(' ' || p1.titelpre, ''))
-				//~ ELSE NULL
-   			 //~ END AS p1
-   		//~ ");
-		//~ $this->AbschlusspruefungModel->addSelect("
-			//~ CASE
-				//~ WHEN pruefer2 IS NOT NULL
-				//~ THEN CONCAT(p2.nachname, ' ', p2.vorname, COALESCE(' ' || p2.titelpre, ''))
-				//~ ELSE NULL
-   			 //~ END AS p2
-		//~ ");
-		//~ $this->AbschlusspruefungModel->addSelect("
-			//~ CASE
-				//~ WHEN pruefer3 IS NOT NULL
-				//~ THEN CONCAT(p3.nachname, ' ', p3.vorname, COALESCE(' ' || p3.titelpre, ''))
-				//~ ELSE NULL
-   			 //~ END AS p3
-		//~ ");
-		//~ $this->AbschlusspruefungModel->addSelect("
-			//~ CASE
-				//~ WHEN vorsitz IS NOT NULL
-				//~ THEN CONCAT(pv.nachname, ' ', pv.vorname, COALESCE(' ' || pv.titelpre, ''), ' (', ben.uid , ')' )
-				//~ ELSE NULL
-   			 //~ END AS pv
-		//~ ");
+		$this->AbschlusspruefungModel->addSelect('lehre.tbl_abschlusspruefung.*');
+		$this->AbschlusspruefungModel->addSelect("
+			CASE
+				WHEN pruefer1 IS NOT NULL
+				THEN CONCAT(p1.nachname, ' ', p1.vorname, COALESCE(' ' || p1.titelpre, ''))
+				ELSE NULL
+   			 END AS p1
+   		");
+		$this->AbschlusspruefungModel->addSelect("
+			CASE
+				WHEN pruefer2 IS NOT NULL
+				THEN CONCAT(p2.nachname, ' ', p2.vorname, COALESCE(' ' || p2.titelpre, ''))
+				ELSE NULL
+   			 END AS p2
+		");
+		$this->AbschlusspruefungModel->addSelect("
+			CASE
+				WHEN pruefer3 IS NOT NULL
+				THEN CONCAT(p3.nachname, ' ', p3.vorname, COALESCE(' ' || p3.titelpre, ''))
+				ELSE NULL
+   			 END AS p3
+		");
+		$this->AbschlusspruefungModel->addSelect("
+			CASE
+				WHEN vorsitz IS NOT NULL
+				THEN CONCAT(pv.nachname, ' ', pv.vorname, COALESCE(' ' || pv.titelpre, ''), ' (', ben.uid , ')' )
+				ELSE NULL
+   			 END AS pv
+		");
 		$this->AbschlusspruefungModel->addJoin('public.tbl_benutzer ben', 'ON (ben.uid = lehre.tbl_abschlusspruefung.vorsitz)', 'LEFT');
 		$this->AbschlusspruefungModel->addJoin('public.tbl_person pv', 'ON (pv.person_id = ben.person_id)', 'LEFT');
 		$this->AbschlusspruefungModel->addJoin('public.tbl_person p1', 'ON (p1.person_id = lehre.tbl_abschlusspruefung.pruefer1)', 'LEFT');
@@ -228,10 +220,8 @@ class Abschlusspruefung extends FHCAPI_Controller
 		$this->terminateWithSuccess($typStudiengang);
 	}
 
-	public function getMitarbeiter()
+	public function getMitarbeiter($searchString)
 	{
-		$searchString = $this->input->get('searchString') ?? '';
-
 		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
 
 		$result = $this->MitarbeiterModel->searchMitarbeiter($searchString, 'mitAkadGrad');
@@ -242,10 +232,8 @@ class Abschlusspruefung extends FHCAPI_Controller
 		$this->terminateWithSuccess($result ?: []);
 	}
 
-	public function getPruefer()
+	public function getPruefer($searchString)
 	{
-		$searchString = $this->input->get('searchString') ?? '';
-
 		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
 
 		$result = $this->MitarbeiterModel->searchMitarbeiter($searchString, 'ohneMaUid');
@@ -456,4 +444,58 @@ class Abschlusspruefung extends FHCAPI_Controller
 		}
 		$this->terminateWithSuccess('step3');
 	}
+
+	/*
+	* returns list of all Mitarbeiter
+	* as key value list to be used in select or autocomplete
+	*/
+	public function getAllMitarbeiter()
+	{
+		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
+
+		$sql = "
+			SELECT
+			    ma.mitarbeiter_uid as mitarbeiter_uid,
+				CONCAT(p.nachname, ' ', p.vorname, ' (', ma.mitarbeiter_uid, ')') as label
+			FROM
+			  public.tbl_mitarbeiter ma
+			  JOIN public.tbl_benutzer bn ON (bn.uid = ma.mitarbeiter_uid)
+			  JOIN public.tbl_person p ON (p.person_id = bn.person_id)
+			ORDER BY
+			p.nachname ASC
+			";
+
+		$result = $this->MitarbeiterModel->execReadOnlyQuery($sql);
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	/*
+	* returns list of all Persons
+	* as key value list to be used in select or autocomplete
+	*/
+	public function getAllPersons()
+	{
+		$this->load->model('person/Person_model', 'PersonModel');
+
+		$sql = "
+			SELECT
+			    p.vorname, p.nachname, p.person_id,
+				CONCAT(p.nachname, ' ', p.vorname) as label
+			FROM
+			  public.tbl_person p
+			 -- JOIN public.tbl_benutzer bn ON (p.person_id = bn.person_id)
+			  -- and bn.aktiv = 'true'
+			ORDER BY
+			p.nachname ASC
+			";
+
+		//TODO(manu) check if filter active benutzer
+
+		$result = $this->PersonModel->execReadOnlyQuery($sql);
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
 }

application/controllers/api/frontend/v1/stv/Archiv.php

@@ -39,7 +39,7 @@ class Archiv extends FHCAPI_Controller
 			'archive' => ['admin:w', 'assistenz:w'],
 			'download' => ['admin:w', 'assistenz:w'],
 			'update' => ['admin:w'],
-			'delete' => ['admin:w', 'assistenz:w'],
+			'delete' => ['admin:w', 'assistenz:w']
 		]);
 
 		// Load models
@@ -107,9 +107,13 @@ class Archiv extends FHCAPI_Controller
 
 		$result = $this->AkteModel->load($akte_id);
 
+
 		if (!hasData($result)) $this->terminateWithError('Akte not found');
 
+		$data = $this->getDataOrTerminateWithError($result);
+
 		$data = getData($result)[0];
+		//$this->addMeta("daa", $data->inhalt);
 
 		$fileObj = new stdClass();
 		if (isset($data->inhalt) && $data->inhalt != '')
@@ -129,7 +133,12 @@ class Archiv extends FHCAPI_Controller
 			//header("Content-type: $data->mimetype");
 			header('Content-Disposition: attachment; filename="'.$data->titel.'"');
 			readfile($filename);
+			//echo base64_decode($data->inhalt);
 			die();
+			//~ $fileObj->file = $data->inhalt;
+			//~ $fileObj->name = $data->titel;
+			//~ $fileObj->mimetype = $data->mimetype;
+			//~ $fileObj->disposition = 'attachment';
 		}
 		else
 		{
@@ -137,6 +146,12 @@ class Archiv extends FHCAPI_Controller
 
 			$result = $this->aktelib->get($akte_id);
 		}
+
+	/*	$fileObj->filename
+	 * 	$fileObj->file
+	 * 	$fileObj->name
+	 * 	$fileObj->mimetype
+	 * 	$fileObj->disposition*/
 	}
 
 	/**

application/controllers/api/frontend/v1/stv/Aufnahmetermine.php

@@ -298,7 +298,7 @@ class Aufnahmetermine extends FHCAPI_Controller
 		$reihungstestangetreten =
 			(isset($formData['reihungstestangetreten']) && !empty($formData['reihungstestangetreten']))
 				? $formData['reihungstestangetreten']
-				: false;
+				: null;
 		$aufnahmegruppe_kurzbz =
 			(isset($formData['aufnahmegruppe_kurzbz']) && !empty($formData['aufnahmegruppe_kurzbz']))
 				? $formData['aufnahmegruppe_kurzbz']

application/controllers/api/frontend/v1/stv/Config.php

@@ -33,9 +33,6 @@ class Config extends FHCAPI_Controller
 	{
 		// TODO(chris): permissions
 		parent::__construct([
-			'get' => ['admin:r', 'assistenz:r'],
-			'set' => ['admin:r', 'assistenz:r'],
-			'filter' => ['admin:r', 'assistenz:r'],
 			'student' => ['admin:r', 'assistenz:r'],
 			'students' => ['admin:r', 'assistenz:r']
 		]);
@@ -48,255 +45,13 @@ class Config extends FHCAPI_Controller
 			'lehre',
 			'stv',
 			'konto',
-			'abschlusspruefung',
-			'projektarbeit'
+			'abschlusspruefung'
 		]);
 
 		// Load Config
 		$this->load->config('stv');
 	}
 
-	/**
-	 * get App config
-	 */
-	public function get()
-	{
-		$this->load->model('system/Variable_model', 'VariableModel');
-		$this->load->config('stv');
-
-		$config = [];
-
-		#number_displayed_past_studiensemester
-		$result = $this->VariableModel->getVariables(getAuthUID(), ['number_displayed_past_studiensemester']);
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$number_displayed_past_studiensemester_default = $this->config->item('number_displayed_past_studiensemester_default');
-
-		$config['number_displayed_past_studiensemester'] = [
-			"type" => "number",
-			"label" => $this->p->t('stv', 'settings_no_displayed_past_sem'),
-			"value" => $data['number_displayed_past_studiensemester']
-				?? $number_displayed_past_studiensemester_default
-		];
-
-		#font_size
-		$result = $this->VariableModel->getVariables(getAuthUID(), ['stv_font_size']);
-		$data = $this->getDataOrTerminateWithError($result);
-		$config['font_size'] = [
-			"type" => "select",
-			"label" => $this->p->t('stv', 'settings_fontsize'),
-			"value" => $data['stv_font_size'] ?? "fs_normal",
-			"options" => [
-				"fs_xx-small" => $this->p->t('stv', 'settings_fontsize_xx-small'),
-				"fs_x-small" => $this->p->t('stv', 'settings_fontsize_x-small'),
-				"fs_small" => $this->p->t('stv', 'settings_fontsize_small'),
-				"fs_normal" => $this->p->t('stv', 'settings_fontsize_normal'),
-				"fs_big" => $this->p->t('stv', 'settings_fontsize_big'),
-				"fs_huge" => $this->p->t('stv', 'settings_fontsize_huge')
-			]
-		];
-
-		#others
-		Events::trigger('stv_config_get', function & () use (&$config) {
-			return $config;
-		});
-
-		$this->terminateWithSuccess($config);
-	}
-
-	/**
-	 * set App config
-	 */
-	public function set()
-	{
-		$this->load->model('system/Variable_model', 'VariableModel');
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules(
-			'number_displayed_past_studiensemester',
-			$this->p->t('stv', 'settings_no_displayed_past_sem'),
-			'required|integer'
-		);
-		$this->form_validation->set_rules(
-			'font_size',
-			$this->p->t('stv', 'settings_fontsize'),
-			'required|in_list[fs_xx-small,fs_x-small,fs_small,fs_normal,fs_big,fs_huge]'
-		);
-
-		Events::trigger('stv_config_validation', $this->form_validation);
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-
-		$this->VariableModel->setVariable(
-			getAuthUID(),
-			'number_displayed_past_studiensemester',
-			$this->input->post('number_displayed_past_studiensemester')
-		);
-		$this->VariableModel->setVariable(
-			getAuthUID(),
-			'stv_font_size',
-			$this->input->post('font_size')
-		);
-
-		Events::trigger('stv_config_set', $this->input);
-
-		$this->terminateWithSuccess();
-	}
-	
-	/*
-	 * Get the config for the student filters
-	 *
-	 * @return void
-	 */
-	public function filter()
-	{
-		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
-
-		$this->load->model('crm/Buchungstyp_model', 'BuchungstypModel');
-
-		$this->BuchungstypModel->addOrder('beschreibung');
-		
-		$result = $this->BuchungstypModel->load();
-
-		$buchungstyp_kurzbz = $this->getDataOrTerminateWithError($result);
-		$buchungstyp_kurzbz_plus_all = array_merge([[
-			'buchungstyp_kurzbz' => 'all',
-			'beschreibung' => $this->p->t('stv', 'konto_all_types')
-		]], $buchungstyp_kurzbz);
-
-		$this->load->model('crm/Statusgrund_model', 'StatusgrundModel');
-
-		$result = $this->StatusgrundModel->getAktiveGruende();
-		
-		$statusgruende = $this->getDataOrTerminateWithError($result);
-
-		$result = [];
-
-		$result[] = [
-			'id' => 'filter_konto_count_0',
-			'label' => $this->p->t('stv', 'filter_konto_count_0'),
-			'type' => 'konto',
-			'fixed' => [
-				'missing' => true,
-				'usestdsem' => true
-			],
-			'dynamic' => [
-				'buchungstyp_kurzbz' => [
-					'type' => 'select',
-					'values' => $buchungstyp_kurzbz,
-					'value_key' => 'buchungstyp_kurzbz',
-					'label_key' => 'beschreibung'
-				]
-			]
-		];
-		$result[] = [
-			'id' => 'filter_konto_missing_counter',
-			'label' => $this->p->t('stv', 'filter_konto_missing_counter'),
-			'type' => 'konto_counter',
-			'dynamic' => [
-				'buchungstyp_kurzbz' => [
-					'type' => 'select',
-					'values' => $buchungstyp_kurzbz_plus_all,
-					'value_key' => 'buchungstyp_kurzbz',
-					'label_key' => 'beschreibung'
-				],
-				'samestg' => [
-					'type' => 'bool',
-					'label' => $this->p->t('stv', 'filter_konto_samestg'),
-					'default' => $this->variablelib->getVar('kontofilterstg') == 'true'
-				]
-			]
-		];
-		$result[] = [
-			'id' => 'filter_documents',
-			'label' => $this->p->t('stv', 'filter_documents'),
-			'type' => 'documents'
-		];
-		$result[] = [
-			'id' => 'filter_konto_missing_counter_past',
-			'label' => $this->p->t('stv', 'filter_konto_missing_counter_past'),
-			'type' => 'konto_counter',
-			'fixed' => [
-				'past' => true
-			],
-			'dynamic' => [
-				'buchungstyp_kurzbz' => [
-					'type' => 'select',
-					'values' => $buchungstyp_kurzbz_plus_all,
-					'value_key' => 'buchungstyp_kurzbz',
-					'label_key' => 'beschreibung'
-				],
-				'samestg' => [
-					'type' => 'bool',
-					'label' => $this->p->t('stv', 'filter_konto_samestg'),
-					'default' => $this->variablelib->getVar('kontofilterstg') == 'true'
-				]
-			]
-		];
-		$result[] = [
-			'id' => 'filter_konto_missing_studiengebuehr',
-			'label' => $this->p->t('stv', 'filter_konto_missing_studiengebuehr'),
-			'type' => 'konto',
-			'fixed' => [
-				'missing' => true,
-				'usestdsem' => true
-			],
-			'dynamic' => [
-				'buchungstyp_kurzbz' => [
-					'type' => 'select',
-					'values' => $buchungstyp_kurzbz,
-					'value_key' => 'buchungstyp_kurzbz',
-					'label_key' => 'beschreibung'
-				]
-			]
-		];
-		$result[] = [
-			'id' => 'filter_konto_studiengebuehrerhoeht',
-			'label' => $this->p->t('stv', 'filter_konto_studiengebuehrerhoeht'),
-			'type' => 'konto',
-			'fixed' => [
-				'usestdsem' => true
-			],
-			'dynamic' => [
-				'buchungstyp_kurzbz' => [
-					'type' => 'select',
-					'values' => $buchungstyp_kurzbz,
-					'value_key' => 'buchungstyp_kurzbz',
-					'label_key' => 'beschreibung'
-				]
-			]
-		];
-		$result[] = [
-			'id' => 'filter_zgv_without_date',
-			'label' => $this->p->t('stv', 'filter_zgv_without_date'),
-			'type' => 'zgv'
-		];
-		$result[] = [
-			'id' => 'filter_statusgrund',
-			'label' => $this->p->t('stv', 'filter_statusgrund'),
-			'type' => 'statusgrund',
-			'fixed' => [
-				'usestdsem' => true
-			],
-			'dynamic' => [
-				'statusgrund_id' => [
-					'type' => 'select',
-					'values' => $statusgruende,
-					'value_key' => 'statusgrund_id',
-					'label_key' => 'bezeichnung'
-				]
-			]
-		];
-
-		Events::trigger('stv_conf_filter', function & () use (&$result) {
-			return $result;
-		});
-
-		$this->terminateWithSuccess($result);
-	}
-
 	public function student()
 	{
 		$result = [];
@@ -304,21 +59,21 @@ class Config extends FHCAPI_Controller
 
 		$result['details'] = [
 			'title' => $this->p->t('stv', 'tab_details'),
-			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Details.js'),
+			'component' => './Stv/Studentenverwaltung/Details/Details.js',
 			'config' => $config['details']
 		];
 
 		$result['notes'] = [
 			'title' => $this->p->t('stv', 'tab_notes'),
-			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Notizen.js'),
+			'component' => './Stv/Studentenverwaltung/Details/Notizen.js',
 			'config'	=> $config['notes'],
 			'showSuffix' => ($config['notes']['showCountNotes'] ?? false),
-			'suffixhelper' => absoluteJsImportUrl('public/js/helpers/Stv/Studentenverwaltung/Details/Notizen/NotizenSuffixHelper.js')
+			'suffixhelper' => APP_ROOT . 'public/js/helpers/Stv/Studentenverwaltung/Details/Notizen/NotizenSuffixHelper.js'
 		];
 
 		$result['contact'] = [
 			'title' => $this->p->t('stv', 'tab_contact'),
-			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Kontakt.js'),
+			'component' => './Stv/Studentenverwaltung/Details/Kontakt.js',
 			'config' => [
 				'showBankaccount' => $this->permissionlib->isBerechtigt('mitarbeiter/bankdaten')
 					|| $this->permissionlib->isBerechtigt('student/bankdaten')
@@ -326,23 +81,20 @@ class Config extends FHCAPI_Controller
 		];
 		$result['prestudent'] = [
 			'title' => $this->p->t('stv', 'tab_prestudent'),
-			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js'),
+			'component' => './Stv/Studentenverwaltung/Details/Prestudent.js',
 			'config' => $config['prestudent']
 		];
 		$result['status'] = [
 			'title' => 'Status',
-			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/MultiStatus.js'),
-			'config' => [
-				'showStatusVorruecken' => defined('STATUS_VORRUECKEN_ANZEIGEN') ? STATUS_VORRUECKEN_ANZEIGEN : true,
-			]
+			'component' => './Stv/Studentenverwaltung/Details/MultiStatus.js'
 		];
 		$result['documents'] = [
 			'title' => $this->p->t('stv', 'tab_documents'),
-			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Dokumente.js')
+			'component' => './Stv/Studentenverwaltung/Details/Dokumente.js'
 		];
 		$result['banking'] = [
 			'title' => $this->p->t('stv', 'tab_banking'),
-			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Konto.js'),
+			'component' => './Stv/Studentenverwaltung/Details/Konto.js',
 			'config' => [
 				'showZahlungsbestaetigung' => (defined('ZAHLUNGSBESTAETIGUNG_ANZEIGEN') && ZAHLUNGSBESTAETIGUNG_ANZEIGEN),
 				'showBuchungsnr' => $this->permissionlib->isBerechtigt('admin'),
@@ -354,22 +106,20 @@ class Config extends FHCAPI_Controller
 		];
 		$result['resources'] = [
 			'title' => $this->p->t('stv', 'tab_resources'),
-			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Betriebsmittel.js'),
-			'showOnlyWithUid' => true
+			'component' => './Stv/Studentenverwaltung/Details/Betriebsmittel.js'
 		];
 		$result['groups'] = [
 			'title' => $this->p->t('stv', 'tab_groups'),
-			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Groups.js'),
-			'showOnlyWithUid' => true
+			'component' => './Stv/Studentenverwaltung/Details/Gruppen.js'
 		];
 		$result['messages'] = [
 			'title' => $this->p->t('stv', 'tab_messages'),
-			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Messages.js'),
+			'component' => './Stv/Studentenverwaltung/Details/Messages.js'
 		];
 
 		$result['grades'] = [
 			'title' => $this->p->t('stv', 'tab_grades'),
-			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Noten.js'),
+			'component' => './Stv/Studentenverwaltung/Details/Noten.js',
 			'showOnlyWithUid' => true,
 			'config' => [
 				'usePoints' => defined('CIS_GESAMTNOTE_PUNKTE') && CIS_GESAMTNOTE_PUNKTE,
@@ -382,42 +132,29 @@ class Config extends FHCAPI_Controller
 
 		$result['exam'] = [
 			'title' => $this->p->t('stv', 'tab_exam'),
-			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Pruefung.js'),
-			'showOnlyWithUid' => true
+			'component' => './Stv/Studentenverwaltung/Details/Pruefung.js'
 		];
 
 		$result['exemptions'] = [
 			'title' => $this->p->t('lehre', 'anrechnungen'),
-			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Anrechnungen.js'),
+			'component' => './Stv/Studentenverwaltung/Details/Anrechnungen.js',
 			'config' => $config['exemptions']
 		];
 
 		$result['finalexam'] = [
 			'title' => $this->p->t('stv', 'tab_finalexam'),
-			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung.js'),
-			'showOnlyWithUid' => true,
+			'component' => './Stv/Studentenverwaltung/Details/Abschlusspruefung.js',
 			'config' => $config['finalexam']
 		];
 
-		$result['projektarbeit'] = [
-			'title' => $this->p->t('stv', 'tab_projektarbeit'),
-			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit.js'),
-			'config' => array_merge(
-				$config['projektarbeit'],
-				['showVertragsdetails' =>
-					defined('FAS_STUDIERENDE_PROJEKTARBEIT_VERTRAGSDETAILS_ANZEIGEN') && FAS_STUDIERENDE_PROJEKTARBEIT_VERTRAGSDETAILS_ANZEIGEN]
-			)
-		];
-
 		$result['mobility'] = [
 			'title' => $this->p->t('stv', 'tab_mobility'),
-			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Mobility.js'),
-			'showOnlyWithUid' => true
+			'component' => './Stv/Studentenverwaltung/Details/Mobility.js'
 		];
 
 		$result['archive'] = [
 			'title' => $this->p->t('stv', 'tab_archive'),
-			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Archiv.js'),
+			'component' => './Stv/Studentenverwaltung/Details/Archiv.js',
 			'config' => [
 				'showEdit' => $this->permissionlib->isBerechtigt('admin')
 			]
@@ -425,24 +162,22 @@ class Config extends FHCAPI_Controller
 
 		$result['jointstudies'] = [
 			'title' => $this->p->t('stv', 'tab_jointstudies'),
-			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/JointStudies.js'),
-			'showOnlyWithUid' => true
+			'component' => './Stv/Studentenverwaltung/Details/JointStudies.js'
 		];
 
 		$result['coursedates'] = [
 			'title' => $this->p->t('stv', 'tab_courseDates'),
-			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine.js')
+			'component' => './Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine.js'
 		];
 
 		$result['admissionDates'] = [
 			'title' => $this->p->t('stv', 'tab_admissionDates'),
-			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine.js')
+			'component' => './Stv/Studentenverwaltung/Details/Aufnahmetermine.js'
 		];
 
 		$result['functions'] = [
 			'title' => $this->p->t('stv', 'tab_functions'),
-			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Funktionen.js'),
-			'showOnlyWithUid' => true
+			'component' => './Stv/Studentenverwaltung/Details/Funktionen.js'
 		];
 
 		Events::trigger('stv_conf_student', function & () use (&$result) {
@@ -460,7 +195,7 @@ class Config extends FHCAPI_Controller
 		$config = $this->config->item('tabs');
 		$result['banking'] = [
 			'title' => $this->p->t('stv', 'tab_banking'),
-			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Konto.js'),
+			'component' => './Stv/Studentenverwaltung/Details/Konto.js',
 			'config' => [
 				'showZahlungsbestaetigung' => (defined('ZAHLUNGSBESTAETIGUNG_ANZEIGEN') && ZAHLUNGSBESTAETIGUNG_ANZEIGEN),
 				'showBuchungsnr' => $this->permissionlib->isBerechtigt('admin'),
@@ -470,14 +205,9 @@ class Config extends FHCAPI_Controller
 				'additionalCols' => []
 			]
 		];
-		$result['groups'] = [
-			'title' => $this->p->t('stv', 'tab_groups'),
-			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Groups.js'),
-			'showOnlyWithUid' => true
-		];
 		$result['status'] = [
 			'title' => 'Status',
-			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/MultiStatus.js'),
+			'component' => './Stv/Studentenverwaltung/Details/MultiStatus.js',
 			'config' => [
 				'changeStatusToAbbrecherStgl' => $this->permissionlib->isBerechtigt('admin'),
 				'changeStatusToAbbrecherStud' => $this->permissionlib->isBerechtigt('admin'),
@@ -488,37 +218,17 @@ class Config extends FHCAPI_Controller
 		];
 		$result['finalexam'] = [
 			'title' => $this->p->t('stv', 'tab_finalexam'),
-			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung.js'),
-			'showOnlyWithUid' => true,
+			'component' => './Stv/Studentenverwaltung/Details/Abschlusspruefung.js',
 			'config' => $config['finalexam']
 		];
 		$result['archive'] = [
 			'title' => $this->p->t('stv', 'tab_archive'),
-			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Archiv.js'),
+			'component' => './Stv/Studentenverwaltung/Details/Archiv.js',
 			'config' => [
 				'showEdit' => $this->permissionlib->isBerechtigt('admin')
 			]
 		];
 
-		if($this->permissionlib->isBerechtigt('basis/person'))
-		{
-			$result['combinePeople'] = [
-				'title' => $this->p->t('stv', 'tab_combine_people'),
-				'component' => './Stv/Studentenverwaltung/Details/CombinePeople.js',
-				'config' => $config['combinePeople']
-			];
-		}
-
-		$result['kontaktieren'] = [
-			'title' => $this->p->t('stv', 'tab_kontaktieren'),
-			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Kontaktieren.js'),
-		];
-
-		$result['messages'] = [
-			'title' => $this->p->t('stv', 'tab_messages'),
-			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/Messages.js'),
-		];
-
 		Events::trigger('stv_conf_students', function & () use (&$result) {
 			return $result;
 		});

application/controllers/api/frontend/v1/stv/Dokumente.php

@@ -2,7 +2,6 @@
 
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
-use \CI3_Events as Events;
 use \DateTime as DateTime;
 
 class Dokumente extends FHCAPI_Controller
@@ -20,8 +19,6 @@ class Dokumente extends FHCAPI_Controller
 			'getDoktypen' => ['admin:r', 'assistenz:r'],
 			'uploadDokument' => ['admin:rw', 'assistenz:rw'],
 			'download' => ['admin:rw', 'assistenz:rw'],
-			'getDocumentDropDown' => ['admin:rw', 'assistenz:rw'],
-			'getDocumentDropDownMulti' => ['admin:rw', 'assistenz:rw'],
 		]);
 
 		// Load Libraries
@@ -569,422 +566,4 @@ class Dokumente extends FHCAPI_Controller
 			return false;
 		}
 	}
-
-	public function getDocumentDropDown($prestudent_id, $studiensemester_kurzbz, $studiengang_kz)
-	{
-		$this->load->helper('hlp_common');
-		//permission to create also odt, and doc outputs of certain documents(menu abschlusspruefung)
-		$hasPermissionOutputformat = $this->permissionlib->isBerechtigt('system/change_outputformat', 's');
-
-		if (!$prestudent_id)
-			$this->terminateWithError($this->p->t('ui', 'errorMissingValue', ['value' => 'Prestudent_id']), self::ERROR_TYPE_GENERAL);
-		if (!$studiensemester_kurzbz)
-			$this->terminateWithError($this->p->t('ui', 'errorMissingValue', ['value' => 'Studiensemester']), self::ERROR_TYPE_GENERAL);
-		if(!$studiengang_kz)
-			$this->terminateWithError($this->p->t('ui', 'errorMissingValue', ['value' => 'Studiengang_kz']), self::ERROR_TYPE_GENERAL);
-
-
-		$uid = $this->_loadUIDFromPrestudent($prestudent_id);
-		$semArray = $this->_getEntriesStudiensemester();
-		$stgTyp = $this->_getStudiengangstyp($studiengang_kz);
-
-		$documents = [
-			buildDropdownEntryPrintArray("accountinfo", "Accountinfoblatt", "xml=accountinfoblatt.xml.php&xsl=AccountInfo&output=pdf", $uid, 10, null),
-			buildDropdownEntryPrintArray("ausbildungsvertrag", "Ausbildungsvertrag", "xml=ausbildungsvertrag.xml.php&xsl=Ausbildungsver&output=pdf&prestudent_id=$prestudent_id", null,20, null),
-			buildDropdownEntryPrintArray("ausbildungsvertrag_en", "Ausbildungsvertrag Zweisprachig", "xml=ausbildungsvertrag.xml.php&xsl=AusbVerEng&output=pdf&prestudent_id=$prestudent_id", null,21, null),
-
-			buildDropdownEntryPrintArray("bescheid", "Bescheid (nur Voransicht)", "xml=abschlusspruefung.rdf.php&xsl_stg_kz=$studiengang_kz&xsl=Bescheid&output=pdf", $uid, 25, null),
-			buildDropdownEntryPrintArray("diplomasupp", "Diploma Supplement (nur Voransicht)", "xml=diplomasupplement.xml.php&xsl_stg_kz=$studiengang_kz&xsl=DiplSupplement&output=pdf", $uid, 26, null),
-
-			buildDropdownEntryPrintArray("studienbestaetigung", "Studienbestätigung", "xml=student.rdf.php&xsl=Inskription&output=pdf&ss=$studiensemester_kurzbz&xsl_stg_kz=$studiengang_kz", $uid, 50, null),
-			buildDropdownEntryPrintArray("studienbestaetigung_en", "Studienbestätigung Englisch", "xml=student.rdf.php&xsl=InskriptionEng&output=pdf&ss=$studiensemester_kurzbz&xsl_stg_kz=$studiengang_kz", $uid, 51, null),
-			buildDropdownEntryPrintArray("zutrittskarte", "Zutrittskarte", "xsl=ZutrittskarteStud&output=pdf&data=$uid", $uid,200, "zutrittskarte.php"),
-			buildDropdownEntryPrintArray("studienblatt", "Studienblatt", "xml=studienblatt.xml.php&xsl=Studienblatt&output=pdf&ss=$studiensemester_kurzbz", $uid, 60, null),
-			buildDropdownEntryPrintArray("studienblatt_eng", "Studienblatt Englisch", "xml=studienblatt.xml.php&xsl=StudienblattEng&output=pdf&ss=$studiensemester_kurzbz", $uid, 61, null),
-
-			$this->buildStudienerfolgSubmenu("de", $uid, $semArray, $studiensemester_kurzbz),
-			$this->buildStudienerfolgSubmenu("en", $uid, $semArray, $studiensemester_kurzbz),
-			$this->buildStudienerfolgSubmenu("de", $uid, $semArray, $studiensemester_kurzbz, true),
-			$this->buildStudienerfolgSubmenu("en", $uid, $semArray, $studiensemester_kurzbz, true),
-
-			[
-				"id" => "submenu_studstatus",
-				"type" => "submenu",
-				"name" => "Verwaltung des StudierendenStatus",
-				"order" => 110,
-				"data" => [
-					buildDropdownEntryPrintArray("Abmeldung", "Abmeldung", "xml=AntragAbmeldung.xml.php&xsl=AntragAbmeldung&prestudent_id=$prestudent_id&output=pdf", $uid, null, null),
-					buildDropdownEntryPrintArray("Abmeldung durch Stgl", "AntragAbmeldungStgl", "xml=AntragAbmeldungStgl.xml.php&xsl=AntragAbmeldungStgl&prestudent_id=$prestudent_id&output=pdf", $uid, null, null),
-					buildDropdownEntryPrintArray("Unterbrechung", "Unterbrechung", "xml=AntragUnterbrechung.xml.php&xsl=AntragUnterbrechung&prestudent_id=$prestudent_id&output=pdf", $uid, null, null),
-					buildDropdownEntryPrintArray("Wiederholung", "Abmeldung durch Ablauf der Wiederholungsfrist", "xml=AntragWiederholung.xml.php&xsl=AntragWiederholung&prestudent_id=$prestudent_id&output=pdf", $uid, null, null),
-				]
-			],
-
-			//Bakkzeugnis bzw. Diplomzeugnis is just shown in tab final_exam
-			buildDropdownEntryPrintArray("zeugnis", "Zeugnis", "xml=zeugnis.rdf.php&xsl=Zeugnis&output=pdf&xsl_stg_kz=$studiengang_kz&ss=$studiensemester_kurzbz", $uid, 121, null),
-			buildDropdownEntryPrintArray("zeugnis_en", "Zeugnis Englisch", "xml=zeugnis.rdf.php&xsl=ZeugnisEng&output=pdf&xsl_stg_kz=$studiengang_kz&ss=$studiensemester_kurzbz", $uid, 122, null),
-
-
-		];
-
-		Events::trigger('DocumentGenerationDropDown',
-			// passing $menu per reference
-			function & () use (&$documents) {
-				return $documents;
-			},
-			$prestudent_id,
-			$studiensemester_kurzbz,
-			$studiengang_kz
-		);
-
-		$extraEntries = $this->loadDropDownEntriesBakkOrDipl($stgTyp, $uid);
-
-		$documents = array_merge($documents, $extraEntries);
-
-		usort($documents, function ($a, $b) {
-			$orderA = isset($a['order']) ? (int)$a['order'] : PHP_INT_MAX;
-			$orderB = isset($b['order']) ? (int)$b['order'] : PHP_INT_MAX;
-			return $orderA <=> $orderB;
-		});
-
-		$this->terminateWithSuccess($documents);
-		//return $documents || null;
-	}
-
-	public function getDocumentDropDownMulti($studiensemester_kurzbz,$studiengang_kz)
-	{
-		//permission to create also odt, and doc outputs of certain documents (menu abschlusspruefung)
-		$hasPermissionOutputformat = $this->permissionlib->isBerechtigt('system/change_outputformat', 's');
-
-		$studentUids = $this->input->get('studentUids');
-		$prestudentIds = [];
-
-		if (is_array($studentUids) && !empty($studentUids)) {
-			foreach ($studentUids as $uid) {
-				$prestudent_id = $this-> _loadPrestudentFromUid($uid);
-				$prestudentIds[] = $prestudent_id;
-			}
-		}
-		else
-		{
-			$this->terminateWithError($this->p->t('ui', 'errorMissingValue', ['value' => 'Array StudentUIDs']), self::ERROR_TYPE_GENERAL);
-		}
-
-		if (!$studiensemester_kurzbz)
-			$this->terminateWithError($this->p->t('ui', 'errorMissingValue', ['value' => 'Studiensemester']), self::ERROR_TYPE_GENERAL);
-		if(!$studiengang_kz)
-			$this->terminateWithError($this->p->t('ui', 'errorMissingValue', ['value' => 'Studiengang_kz']), self::ERROR_TYPE_GENERAL);
-
-
-		$uidString = implode(";", $studentUids);
-		$prestudentIdsString = implode(";", $prestudentIds);
-
-		$semArray = $this->_getEntriesStudiensemester();
-		$stgTyp = $this->_getStudiengangstyp($studiengang_kz);
-
-		$documents = [
-			buildDropdownEntryPrintArray("accountinfo", "Accountinfoblatt", "xml=accountinfoblatt.xml.php&xsl=AccountInfo&output=pdf", $uidString, 10, null),
-			buildDropdownEntryPrintArray("ausbildungsvertrag", "Ausbildungsvertrag", "xml=ausbildungsvertrag.xml.php&xsl=Ausbildungsver&output=pdf", $uidString, 20, null),
-			buildDropdownEntryPrintArray("ausbildungsvertrag_en", "Ausbildungsvertrag Englisch", "xml=ausbildungsvertrag.xml.php&xsl=AusbVerEng&output=pdf", $uidString, 21, null),
-			buildDropdownEntryPrintArray("studienbestaetigung", "Studienbestätigung", "xml=student.rdf.php&xsl=Inskription&output=pdf&ss=$studiensemester_kurzbz&xsl_stg_kz=$studiengang_kz", $uidString, 50, null),
-			buildDropdownEntryPrintArray("studienbestaetigung_en", "Studienbestätigung Englisch", "xml=student.rdf.php&xsl=InskriptionEng&output=pdf&ss=$studiensemester_kurzbz&xsl_stg_kz=$studiengang_kz", $uidString, 51, null),
-			buildDropdownEntryPrintArray("zutrittskarte", "Zutrittskarte", "xsl=ZutrittskarteStud&output=pdf&data=$uidString", $uidString,200, "zutrittskarte.php"),
-			buildDropdownEntryPrintArray("studienblatt", "Studienblatt", "xml=studienblatt.xml.php&xsl=Studienblatt&output=pdf&ss=$studiensemester_kurzbz", $uidString, 60, null),
-			buildDropdownEntryPrintArray("studienblatt_eng", "Studienblatt Englisch", "xml=studienblatt.xml.php&xsl=StudienblattEng&output=pdf&ss=$studiensemester_kurzbz", $uidString, 61, null),
-
-			// Studienerfolg Menüs automatisch
-			$this->buildStudienerfolgSubmenu("de", $uidString, $semArray, $studiensemester_kurzbz),
-			$this->buildStudienerfolgSubmenu("en", $uidString, $semArray, $studiensemester_kurzbz),
-			$this->buildStudienerfolgSubmenu("de", $uidString, $semArray, $studiensemester_kurzbz, true),
-			$this->buildStudienerfolgSubmenu("en", $uidString, $semArray, $studiensemester_kurzbz, true),
-
-			[
-				"id" => "submenu_studstatus",
-				"type" => "submenu",
-				"name" => "Verwaltung des StudierendenStatus",
-				"order" => 110,
-				"data" => [
-					buildDropdownEntryPrintArray("Abmeldung", "Abmeldung", "xml=AntragAbmeldung.xml.php&xsl=AntragAbmeldung&prestudent_id=$prestudentIdsString&output=pdf", $uidString, null, null),
-					buildDropdownEntryPrintArray("Abmeldung durch Stgl", "AntragAbmeldungStgl", "xml=AntragAbmeldungStgl.xml.php&xsl=AntragAbmeldungStgl&prestudent_id=$prestudentIdsString&output=pdf", $uidString, null, null),
-					buildDropdownEntryPrintArray("Unterbrechung", "Unterbrechung", "xml=AntragUnterbrechung.xml.php&xsl=AntragUnterbrechung&prestudent_id=$prestudentIdsString&output=pdf", $uidString, null, null),
-					buildDropdownEntryPrintArray("Wiederholung", "Abmeldung durch Ablauf der Wiederholungsfrist", "xml=AntragWiederholung.xml.php&xsl=AntragWiederholung&prestudent_id=$prestudentIdsString&output=pdf", $uidString, null, null),
-				]
-			],
-
-			buildDropdownEntryPrintArray("diplomasupp", "Diploma Supplement (nur Voransicht)", "xml=diplomasupplement.xml.php&xsl_stg_kz=$studiengang_kz&xsl=DiplSupplement&output=pdf", $uidString, 35, null),
-			buildDropdownEntryPrintArray("zeugnis", "Zeugnis", "xml=zeugnis.rdf.php&xsl=Zeugnis&output=pdf&xsl_stg_kz=$studiengang_kz&ss=$studiensemester_kurzbz", $uidString, 121, null),
-			buildDropdownEntryPrintArray("zeugnis_en", "Zeugnis Englisch", "xml=zeugnis.rdf.php&xsl=ZeugnisEng&output=pdf&xsl_stg_kz=$studiengang_kz&ss=$studiensemester_kurzbz", $uidString, 122, null),
-		];
-
-		Events::trigger('DocumentGenerationDropDownMulti',
-			// passing $menu per reference
-			function & () use (&$documents) {
-				return $documents;
-			},
-			$studentUids,
-			$studiensemester_kurzbz,
-			$studiengang_kz
-		);
-
-		$extraEntries = $this->loadDropDownEntriesBakkOrDipl($stgTyp, $uidString);
-
-		$documents = array_merge($documents, $extraEntries);
-
-		usort($documents, function ($a, $b) {
-			$orderA = isset($a['order']) ? (int)$a['order'] : PHP_INT_MAX;
-			$orderB = isset($b['order']) ? (int)$b['order'] : PHP_INT_MAX;
-			return $orderA <=> $orderB;
-		});
-
-
-		$this->terminateWithSuccess($documents);
-
-		return $documents || null;
-	}
-
-	private function _loadUIDFromPrestudent($prestudent_id)
-	{
-		if(!$prestudent_id){
-			return $this->terminateWithError("no prestudent ID received.");
-		}
-		$this->load->model('crm/Student_model', 'StudentModel');
-		$result = $this->StudentModel->loadWhere(
-			['prestudent_id' => $prestudent_id]
-		);
-
-		$data = $this->getDataOrTerminateWithError($result);
-		$student = current($data);
-
-		return $student->student_uid;
-	}
-
-	private function _loadPrestudentFromUid($studentUid)
-	{
-
-		$this->load->model('crm/Student_model', 'StudentModel');
-		$result = $this->StudentModel->loadWhere(
-			['student_uid' => $studentUid]
-		);
-
-		$data = $this->getDataOrTerminateWithError($result);
-		$student = current($data);
-
-
-		return $student->prestudent_id;
-	}
-
-	/**
-	 * is building an array with studiensemesterkurzb
-	 * actual studiensemester plus the 5 studiensemester in the past
-
-	 * @return Array Studiensemester_kurzbz
-	 */
-	private function _getEntriesStudiensemester(){
-		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-
-		$this->StudiensemesterModel->addPlusMinus(1, 5);
-		$this->StudiensemesterModel->addOrder('ende', 'DESC');
-		$result = $this->StudiensemesterModel->load();
-		$data = $this->getDataOrTerminateWithError($result);
-
-		foreach($data as $sem)
-		{
-			$semArray[] = $sem->studiensemester_kurzbz;
-		}
-
-		array_shift($semArray);
-
-		return $semArray;
-	}
-	/**
-	 * is returning the typ of Studiengang (Bakk oder Master)
-
-	 * @return character  eg. 'b' or 'm'
-	 */
-	private function _getStudiengangstyp($studiengang_kz)
-	{
-		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
-
-		$result = $this->StudiengangModel->loadWhere(
-			array('studiengang_kz' => $studiengang_kz)
-		);
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$typStudiengang = current($data)->typ;
-
-		return $typStudiengang;
-	}
-
-	/**
-	 * helper function to create ArrayStructure
-	 * actual studiensemester plus the 5 studiensemester in the past
-
-	 * @return Array Studiensemester_kurzbz
-	 */
-	private function buildStudienerfolgSubmenu($lang, $uid, $semArray, $studiensemester_kurzbz, $fa = false)
-	{
-		$entries = [];
-
-		$xsl = $lang === "de" ? "Studienerfolg" : "StudienerfolgEng";
-		$idPrefix = "submenu_studienerfolg_" . $lang . ($fa ? "_fa" : "");
-
-		$entries[] = buildDropdownEntryPrintArray(
-			$idPrefix . "_aktuell",
-			"ausgewähltes Semester",
-			"xml=studienerfolg.rdf.php&xsl=$xsl&ss=$studiensemester_kurzbz" . ($fa ? "&typ=finanzamt" : ""),
-			$uid
-		);
-
-		//all semester
-		$entries[] = buildDropdownEntryPrintArray(
-			$idPrefix . "_all",
-			"alle Semester",
-			"xml=studienerfolg.rdf.php&xsl=$xsl&ss=$studiensemester_kurzbz&all=true" . ($fa ? "&typ=finanzamt" : ""),
-			$uid
-		);
-
-		//sem from array
-		foreach ($semArray as $i => $sem) {
-			$entries[] = buildDropdownEntryPrintArray(
-				$idPrefix . ($i === 0 ? "_akt" : "_minus" . $i),
-				$sem,
-				"xml=studienerfolg.rdf.php&xsl=$xsl&ss=$sem" . ($fa ? "&typ=finanzamt" : ""),
-				$uid
-			);
-
-		}
-		$order = 0;
-		if ($lang === "de" && !$fa) $order = 75; // Studienerfolg
-		if ($lang === "en" && !$fa) $order = 76; // Studienerfolg Englisch
-		if ($lang === "de" &&  $fa) $order = 77; // Studienerfolg Finanzamt
-		if ($lang === "en" &&  $fa) $order = 78; // Studienerfolg Finanzamt Englisch
-
-		return [
-			"id"   => $idPrefix,
-			"type" => "submenu",
-			"name" => "Studienerfolg " . ($fa ? " Finanzamt" : "") . ($lang === "de" ? "" : "Englisch") ,
-			"order" => $order,
-			"data" => $entries,
-		];
-	}
-
-	private function loadDropDownEntriesFinalExam($hasPermissionOutputformat, $stgTyp, $uid)
-	{
-		if ($stgTyp == 'b')
-			$postfix = 'Bakk';
-		else if ($stgTyp == 'm' || $stgTyp == 'd')
-			$postfix = 'Master';
-		else
-			return [];
-
-		$arrayFinalExam = [
-			'pruefungsprotokoll' => [
-				'de' => [
-					'Bakk' => 'PrProtBA',
-					'Master' => 'PrProtMA',
-				],
-				'en' => [
-					'Bakk' => 'PrProtBAEng',
-					'Master' => 'PrProtMAEng',
-				],
-			],
-			'pruefungszeugnis' => [
-				'de' => [
-					'Bakk' => 'Bakkzeugnis',
-					'Master' => 'Diplomzeugnis',
-				],
-				'en' => [
-					'Bakk' => 'BakkzeugnisEng',
-					'Master' => 'DiplomzeugnisEng',
-				],
-			],
-			'urkunde' => [
-				'de' => [
-					'Bakk' => 'Bakkurkunde',
-					'Master' => 'Diplomurkunde',
-				],
-				'en' => [
-					'Bakk' => 'BakkurkundeEng',
-					'Master' => 'DiplomurkundeEng',
-				],
-			],
-		];
-
-		$langLabels = [
-			"de" => "Deutsch",
-			"en" => "Englisch"
-		];
-
-		$docLabels = [
-			"pruefungsprotokoll" => "Prüfungsprotokoll",
-			"pruefungszeugnis" => "Zeugnis",
-			"urkunde" => "Urkunde"
-		];
-
-		$submenuData = [];
-		if ($hasPermissionOutputformat) {
-			foreach ($arrayFinalExam as $docType => $langs) {
-				foreach ($langs as $lang => $types) {
-					$xsl = $types[$postfix];
-					$idPrefix = $docType . "_" . $lang;
-
-					$baseName = $docLabels[$docType] . " " . $langLabels[$lang];
-					$baseUrl = "xml=abschlusspruefung.rdf.php&xsl={$xsl}";
-
-					//3 outputformates
-					foreach (["pdf", "odt", "docx"] as $format) {
-						$submenuData[] = buildDropdownEntryPrintArray(
-							$idPrefix . "_" . $format,
-							$baseName . " (" . strtoupper($format) . ")",
-							$baseUrl . "&output=" . $format,
-							$uid
-						);
-					}
-				}
-			}
-		}
-		else
-		{
-			foreach ($arrayFinalExam as $docType => $langs) {
-				foreach ($langs as $lang => $types) {
-					$xsl = $types[$postfix]; // Auswahl Bakk/Master für jeweilige Sprache
-					$id = $docType . "_" . $lang;
-
-					$name = $docLabels[$docType] . " " . $langLabels[$lang];
-
-					$url = "xml=abschlusspruefung.rdf.php&xsl=" . $xsl . "&output=pdf";
-
-					$submenuData[] = buildDropdownEntryPrintArray($id, $name, $url, $uid);
-				}
-			}
-		}
-		return [
-			"id" => "submenu_finalexam",
-			"type" => "submenu",
-			"name" => "Abschlussprüfung",
-			"data" => $submenuData,
-			"order" => null,
-			"order" => 80,
-		];
-	}
-
-	private function loadDropDownEntriesBakkOrDipl($stgTyp, $uid)
-	{
-		$entries = [];
-
-		if ($stgTyp == 'b')
-		{
-			$entries[] = buildDropdownEntryPrintArray("bakkurkunde", "Bakkurkunde", "xml=abschlusspruefung.rdf.php&xsl=Bakkurkunde&output=pdf", $uid, 22, null);
-			$entries[] = buildDropdownEntryPrintArray("bakkurkundeEng", "Bakkurkunde Englisch", "xml=abschlusspruefung.rdf.php&xsl=BakkurkundeEng&output=pdf", $uid, 23, null);
-		}
-
-		if ($stgTyp == 'm' || $stgTyp == 'd')
-		{
-			$entries[] = buildDropdownEntryPrintArray("diplomurkunde", "Diplomurkunde", "xml=abschlusspruefung.rdf.php&xsl=Diplomurkunde&output=pdf", $uid, 27, null);
-			$entries[] = buildDropdownEntryPrintArray("diplomurkundeEng", "Diplomurkunde Englisch", "xml=abschlusspruefung.rdf.php&xsl=DiplomurkundeEng&output=pdf", $uid, 28, null);
-		}
-
-		return $entries;
-	}
-
 }

application/controllers/api/frontend/v1/stv/Favorites.php

@@ -60,6 +60,17 @@ class Favorites extends FHCAPI_Controller
 
 		$favorites = $this->input->post('favorites');
 
+		$removed = [];
+		while (strlen($favorites) > 64) {
+			$favObj = json_decode($favorites);
+			if (!$favObj->list)
+				break;
+			$removed[] = array_shift($favObj->list);
+			$favorites = json_encode($favObj);
+		}
+		if ($removed)
+			$this->addMeta('removed', $removed);
+
 		$result = $this->VariableModel->setVariable(getAuthUID(), 'stv_favorites', $favorites);
 
 		$this->getDataOrTerminateWithError($result);

application/controllers/api/frontend/v1/stv/GemeinsameStudien.php

@@ -83,7 +83,7 @@ class GemeinsameStudien extends FHCAPI_Controller
 	{
 		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
 
-		$this->StudiensemesterModel->addOrder('start', 'DESC');
+		$this->StudiensemesterModel->addOrder('studienjahr_kurzbz', 'DESC');
 		$result = $this->StudiensemesterModel->load();
 		$data = $this->getDataOrTerminateWithError($result);
 		$this->terminateWithSuccess($data);

application/controllers/api/frontend/v1/stv/Grades.php

@@ -60,8 +60,7 @@ class Grades extends FHCAPI_Controller
 	{
 		$this->load->model('codex/Note_model', 'NoteModel');
 
-		$this->NoteModel->addOrder('notenwert', 'ASC');
-		$this->NoteModel->addOrder('bezeichnung', 'ASC');
+		$this->NoteModel->addOrder('note');
 		
 		$result = $this->NoteModel->load();
 

application/controllers/api/frontend/v1/stv/Gruppen.php

@@ -9,8 +9,6 @@ class Gruppen extends FHCAPI_Controller
 	public function __construct()
 	{
 		parent::__construct([
-			'add' => ['admin:rw', 'assistenz:rw'],
-			'search' => ['admin:r', 'assistenz:r'],
 			'getGruppen' => ['admin:r', 'assistenz:r'],
 			'deleteGruppe' => ['admin:rw', 'assistenz:rw'],
 		]);
@@ -20,9 +18,7 @@ class Gruppen extends FHCAPI_Controller
 
 		// Load language phrases
 		$this->loadPhrases([
-			'ui',
-			'gruppenmanagement',
-			'lehre'
+			'ui', 'gruppenmanagement'
 		]);
 
 		// Load models
@@ -30,141 +26,15 @@ class Gruppen extends FHCAPI_Controller
 		$this->load->model('organisation/Gruppe_model', 'GruppeModel');
 	}
 
-	public function add()
-	{
-		$this->load->library("form_validation");
-
-		$this->form_validation->set_rules(
-			'gruppe_kurzbz',
-			$this->p->t('gruppenmanagement', 'gruppe'),
-			'required|is_in_db[organisation/Gruppe_model]',
-			[
-				'required' => $this->p->t('ui', 'error_fieldRequired'),
-				'is_in_db' => $this->p->t('ui', 'error_fieldNotFound')
-			]
-		);
-		$this->form_validation->set_rules(
-			'uid',
-			$this->p->t('ui', 'student_uid'),
-			'required|is_in_db[crm/Student_model:student_uid]',
-			[
-				'required' => $this->p->t('ui', 'error_fieldRequired'),
-				'is_in_db' => $this->p->t('ui', 'error_fieldNotFound')
-			]
-		);
-		$this->form_validation->set_rules(
-			'studiensemester_kurzbz',
-			$this->p->t('lehre', 'studiensemester'),
-			'required|is_in_db[organisation/Studiensemester_model]',
-			[
-				'required' => $this->p->t('ui', 'error_fieldRequired'),
-				'is_in_db' => $this->p->t('ui', 'error_fieldNotFound')
-			]
-		);
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$gruppe_kurzbz = $this->input->post('gruppe_kurzbz');
-		$uid = $this->input->post('uid');
-		$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
-
-		$result = $this->BenutzergruppeModel->load([
-			$gruppe_kurzbz,
-			$uid
-		]);
-		$benutzergruppe = $this->getDataOrTerminateWithError($result);
-
-		if ($benutzergruppe) {
-			$this->terminateWithError(
-				$this->p->t('gruppenmanagement', 'error_alreadyInGroup', [
-					'uid' => $uid,
-					'studiensemester_kurzbz' => current($benutzergruppe)->studiensemester_kurzbz
-				]),
-				self::ERROR_TYPE_GENERAL
-			);
-		}
-
-		$result = $this->BenutzergruppeModel->insert([
-			'uid' => $uid,
-			'gruppe_kurzbz' => $gruppe_kurzbz,
-			'studiensemester_kurzbz' => $studiensemester_kurzbz,
-			'insertamum' => date('c'),
-			'insertvon' => getAuthUID()
-		]);
-
-		$this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess();
-	}
-
-	public function search()
-	{
-		$query = $this->input->post('query');
-		if (!$query)
-			$this->terminateWithSuccess([]);
-
-		// add query to where clause
-		$query = strtoupper($query);
-		$query = $this->GruppeModel->db->escape_like_str($query);
-		$query = '%' . str_replace(' ', '%', $query) . '%';
-
-		$this->GruppeModel->db->group_start();
-		$this->GruppeModel->db->or_like('UPPER(gruppe_kurzbz)', $query, 'none', false);
-		$this->GruppeModel->db->or_like('UPPER(bezeichnung)', $query, 'none', false);
-		$this->GruppeModel->db->or_like('UPPER(beschreibung)', $query, 'none', false);
-		$this->GruppeModel->db->group_end();
-		
-		// add stg sorting 1
-		$studiengang_kz = $this->input->post('studiengang_kz');
-		$sort_stg = $studiengang_kz ? "WHEN studiengang_kz = " . $this->GruppeModel->escape($studiengang_kz) . " THEN 0" : "";
-
-		// add stg sorting 2
-		$studiengang_kzs = [];
-		$result = $this->permissionlib->getSTG_isEntitledFor('admin');
-		if ($result)
-			$studiengang_kzs = array_merge($studiengang_kzs, $result);
-		$result = $this->permissionlib->getSTG_isEntitledFor('assistenz');
-		if ($result)
-			$studiengang_kzs = array_merge($studiengang_kzs, $result);
-
-		// selects
-		$this->GruppeModel->addSelect("*");
-		$this->GruppeModel->addSelect("CASE
-			" . $sort_stg . "
-			WHEN studiengang_kz IN (" . implode(",", $this->GruppeModel->db->escape($studiengang_kzs)) . ")
-			THEN 1
-			ELSE 2
-		END AS sort_stg");
-
-		// ordering
-		$this->GruppeModel->addOrder("sort_stg");
-		$this->GruppeModel->addOrder("sort");
-		$this->GruppeModel->addOrder("gruppe_kurzbz");
-
-		// default where clause & execute
-		$result = $this->GruppeModel->loadWhere([
-			'lehre' => true,
-			'sichtbar' => true,
-			'aktiv' => true,
-			'direktinskription' => false,
-			'generiert' => false
-		]);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
-
 	public function getGruppen($student_uid)
 	{
-		$this->BenutzergruppeModel->addSelect('gruppe_kurzbz');
-		$this->BenutzergruppeModel->addSelect('bezeichnung');
-		$this->BenutzergruppeModel->addSelect('generiert');
-		$this->BenutzergruppeModel->addSelect('uid');
-		$this->BenutzergruppeModel->addSelect('studiensemester_kurzbz');
-		$this->BenutzergruppeModel->addJoin('public.tbl_gruppe', 'gruppe_kurzbz');
-		$this->BenutzergruppeModel->addOrder('bezeichnung', 'ASC');
+		$this->BenutzergruppeModel ->addSelect('gruppe_kurzbz');
+		$this->BenutzergruppeModel ->addSelect('bezeichnung');
+		$this->BenutzergruppeModel ->addSelect('generiert');
+		$this->BenutzergruppeModel ->addSelect('uid');
+		$this->BenutzergruppeModel ->addSelect('studiensemester_kurzbz');
+		$this->BenutzergruppeModel ->addJoin('public.tbl_gruppe', 'gruppe_kurzbz');
+		$this->BenutzergruppeModel-> addOrder('bezeichnung', 'ASC');
 
 		$result = $this->BenutzergruppeModel->loadWhere(
 			array(
@@ -179,48 +49,29 @@ class Gruppen extends FHCAPI_Controller
 
 	public function deleteGruppe()
 	{
-		$this->load->library("form_validation");
-
-		$this->form_validation->set_rules(
-			'uid',
-			$this->p->t('person', 'UID'),
-			'required',
-			[
-				'required' => $this->p->t('ui', 'error_fieldRequired')
-			]
-		);
-
-		$this->form_validation->set_rules(
-			'gruppe_kurzbz',
-			$this->p->t('gruppenmanagement', 'gruppe'),
-			'required',
-			[
-				'required' => $this->p->t('ui', 'error_fieldRequired')
-			]
-		);
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$uid = $this->input->post('uid');
+		$student_uid = $this->input->post('id');
 		$gruppe_kurzbz = $this->input->post('gruppe_kurzbz');
 
-		// Validate if automatic group generation
-		$result = $this->GruppeModel->loadWhere([
-			'gruppe_kurzbz' => $gruppe_kurzbz
-		]);
+		//Validate if automatic group generation
+		$result = $this->GruppeModel-> loadWhere(
+			array(
+				'gruppe_kurzbz' => $gruppe_kurzbz
+			)
+		);
 		$data = $this->getDataOrTerminateWithError($result);
 		$generation = current($data);
 
-		if ($generation->generiert)
+		if($generation->generiert)
 		{
 			$this->terminateWithError($this->p->t('gruppenmanagement', 'error_deleteGeneratedGroups'), self::ERROR_TYPE_GENERAL);
 		}
 
-		$result = $this->BenutzergruppeModel->delete([
-			'gruppe_kurzbz' => $gruppe_kurzbz,
-			'uid' => $uid
-		]);
+		$result = $this->BenutzergruppeModel->delete(
+			array(
+				'gruppe_kurzbz' => $gruppe_kurzbz,
+				'uid' => $student_uid
+				)
+		);
 
 		$data = $this->getDataOrTerminateWithError($result);
 

application/controllers/api/frontend/v1/stv/Kontakt.php

@@ -52,7 +52,6 @@ class Kontakt extends FHCAPI_Controller
 		// Extra Permissionchecks
 		$permsMa = [];
 		$permsStud = [];
-		$permsDefault = null;
 		switch ($this->router->method) {
 			case 'getBankverbindung':
 			case 'loadBankverbindung':
@@ -69,7 +68,7 @@ class Kontakt extends FHCAPI_Controller
 			case 'getKontakte':
 			case 'loadAddress':
 			case 'loadContact':
-				$permsMa = $permsStud = $permsDefault = ['admin:r', 'assistenz:r'];
+				$permsMa = $permsStud = ['admin:r', 'assistenz:r'];
 				break;
 			case 'addNewAddress':
 			case 'addNewContact':
@@ -77,7 +76,7 @@ class Kontakt extends FHCAPI_Controller
 			case 'updateContact':
 			case 'deleteAddress':
 			case 'deleteContact':
-				$permsMa = $permsStud = $permsDefault = ['admin:rw', 'assistenz:rw'];
+				$permsMa = $permsStud = ['admin:rw', 'assistenz:rw'];
 				break;
 		}
 		if ($this->router->method == 'getAdressen'
@@ -92,7 +91,7 @@ class Kontakt extends FHCAPI_Controller
 			if (is_null($person_id) || !ctype_digit((string)$person_id))
 				$this->terminateWithError( $this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
 
-			$this->checkPermissionsForPerson($person_id, $permsMa, $permsStud, $permsDefault);
+			$this->checkPermissionsForPerson($person_id, $permsMa, $permsStud);
 		} elseif ($this->router->method == 'loadAddress'
 			|| $this->router->method == 'loadContact'
 			|| $this->router->method == 'loadBankverbindung'
@@ -136,7 +135,7 @@ class Kontakt extends FHCAPI_Controller
 
 			$person_id = current($data)->person_id;
 			
-			$this->checkPermissionsForPerson($person_id, $permsMa, $permsStud, $permsDefault);
+			$this->checkPermissionsForPerson($person_id, $permsMa, $permsStud);
 		}
 	}
 	public function getAdressen($person_id)

application/controllers/api/frontend/v1/stv/Konto.php

@@ -352,7 +352,7 @@ class Konto extends FHCAPI_Controller
 				continue;
 			}
 
-			
+
 			$result = $this->KontoModel->insert([
 				'person_id' => $buchung['person_id'],
 				'studiengang_kz' => $buchung['studiengang_kz'],
@@ -361,7 +361,7 @@ class Konto extends FHCAPI_Controller
 				'buchungstyp_kurzbz' => $buchung['buchungstyp_kurzbz'],
 				'credit_points' => $buchung['credit_points'],
 				'zahlungsreferenz' => $buchung['zahlungsreferenz'],
-				'betrag' => number_format($betrag, 2, '.', ''),
+				'betrag' => $betrag,
 				'buchungsdatum' => $buchungsdatum,
 				'mahnspanne' => '0',
 				'buchungsnr_verweis' => $buchung['buchungsnr'],

application/controllers/api/frontend/v1/stv/Lehrverband.php

@@ -1,63 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-
-class Lehrverband extends FHCAPI_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'hasOrgforms' => ['admin:r', 'assistenz:r'],
-			'getTree' => ['admin:r', 'assistenz:r'],
-			'getSpecialgroups' => ['admin:r', 'assistenz:r']
-		]);
-	}
-
-	public function hasOrgforms($studiengang_kz)
-	{
-		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
-		
-		$result = $this->StudiengangModel->load($studiengang_kz);
-		
-		$data = $this->getDataOrTerminateWithError($result);
-		if ($data) {
-			$data = current($data)->mischform;
-		}
-		
-		$this->terminateWithSuccess($data);
-	}
-
-	public function getTree($studiengang_kz)
-	{
-		$this->load->model('organisation/Lehrverband_model', 'LehrverbandModel');
-
-		$result = $this->LehrverbandModel->loadWhere([
-			'studiengang_kz' => $studiengang_kz,
-			'aktiv' => true
-		]);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
-
-	public function getSpecialgroups($studiengang_kz)
-	{
-		$this->load->model('organisation/Gruppe_model', 'GruppeModel');
-
-		$where = [
-			'studiengang_kz' => $studiengang_kz,
-			'lehre' => true,
-			'sichtbar' => true,
-			'aktiv' => true,
-			'direktinskription' => false
-		];
-
-		$result = $this->GruppeModel->loadWhere($where);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
-}

application/controllers/api/frontend/v1/stv/Projektarbeit.php

@@ -1,413 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-use \DateTime as DateTime;
-
-class Projektarbeit extends FHCAPI_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'getProjektarbeit' => ['admin:r', 'assistenz:r'],
-			'loadProjektarbeit' => ['admin:r', 'assistenz:r'],
-			'insertProjektarbeit' => ['admin:rw', 'assistenz:rw'],
-			'updateProjektarbeit' => ['admin:rw', 'assistenz:rw'],
-			'deleteProjektarbeit' => ['admin:rw', 'assistenz:rw'],
-			'getTypenProjektarbeit' => ['admin:r', 'assistenz:r'],
-			'getFirmen' => ['admin:r', 'assistenz:r'],
-			'getLehrveranstaltungen' => ['admin:r', 'assistenz:r'],
-			'getNoten' => ['admin:r', 'assistenz:r'],
-			'getStudiensemester' => ['admin:r', 'assistenz:r']
-		]);
-
-		// Load Libraries
-		$this->load->library('form_validation');
-
-		// Load language phrases
-		$this->loadPhrases([
-			'ui',
-			'person',
-			'projektarbeit'
-		]);
-
-		// Load models
-		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
-		$this->load->model('education/Projekttyp_model', 'ProjekttypModel');
-		$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
-		$this->load->model('ressource/Firma_model', 'FirmaModel');
-		$this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
-		$this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
-		$this->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');
-		$this->load->model('education/Note_model', 'NoteModel');
-		$this->load->model('education/Projektbetreuer_model', 'BetreuerModel');
-		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-
-		// load libraries
-		$this->load->library('PermissionLib');
-	}
-
-	/**
-	 * Get projekt works for a uid.
-	 */
-	public function getProjektarbeit()
-	{
-		$student_uid = $this->input->get('uid');
-
-		if (!isset($student_uid)) $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Student UID']), self::ERROR_TYPE_GENERAL);
-
-		$result = $this->ProjektarbeitModel->getProjektarbeit($student_uid);
-
-		if (isError($result)) $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-
-		if (!hasData($result)) $this->terminateWithSuccess([]);
-
-		$projektarbeiten = getData($result);
-
-		foreach ($projektarbeiten as $projektarbeit)
-		{
-			$projektarbeit_id = $projektarbeit->projektarbeit_id;
-			$abgabeRes = $this->PaabgabeModel->getEndabgabe($projektarbeit_id);
-
-			if (isError($abgabeRes)) $this->terminateWithError(getError($abgabeRes), self::ERROR_TYPE_GENERAL);
-
-			if (hasData($abgabeRes))
-			{
-				$paabgabe = getData($abgabeRes)[0];
-				$projektarbeit->abgabedatum = $paabgabe->abgabedatum;
-			}
-		}
-
-		$this->terminateWithSuccess($projektarbeiten);
-	}
-
-	/**
-	 * Load a single Projektarbeit by id.
-	 */
-	public function loadProjektarbeit()
-	{
-		$projektarbeit_id = $this->input->get('projektarbeit_id');
-
-		if (!isset($projektarbeit_id) || !is_numeric($projektarbeit_id)) return $this->terminateWithError('Projektarbeit Id missing', self::ERROR_TYPE_GENERAL);
-
-		$this->ProjektarbeitModel->addSelect(
-			'lehre.tbl_projektarbeit.projektarbeit_id, titel, titel_english, themenbereich, projekttyp_kurzbz, lehrveranstaltung_id, lehreinheit_id, 
-			firma_id, beginn, ende, gesperrtbis, note, final, freigegeben, tbl_projektarbeit.anmerkung, fa.name AS firma_name'
-		);
-		$this->ProjektarbeitModel->addJoin('lehre.tbl_lehreinheit le', 'lehreinheit_id');
-		$this->ProjektarbeitModel->addJoin('lehre.tbl_lehrveranstaltung lv', 'lehrveranstaltung_id');
-		$this->ProjektarbeitModel->addJoin('public.tbl_firma fa', 'firma_id', 'LEFT');
-		$result = $this->ProjektarbeitModel->loadWhere(
-			array('projektarbeit_id' => $projektarbeit_id)
-		);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess(current($data));
-	}
-
-	/**
-	 * Inwert a Projektarbeit.
-	 */
-	public function insertProjektarbeit()
-	{
-		$student_uid = $this->input->post('uid');
-
-		if (!$student_uid) return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Student UID']), self::ERROR_TYPE_GENERAL);
-
-		if (!$this->_hasBerechtigungForStudent($student_uid))
-			return $this->_outputAuthError([$this->router->method => ['admin:rw', 'assistenz:rw']]);
-
-		$formData = $this->input->post('formData');
-
-		if ($this->_validate($formData) == false)
-		{
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-		}
-
-		$projektarbeit = $this->_getProjektarbeitArr($formData);
-
-		$result = $this->ProjektarbeitModel->insert(
-			array_merge($projektarbeit, ['insertamum' => date('c'), 'insertvon' => getAuthUID(), 'student_uid' => $student_uid])
-		);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
-
-	/**
-	 * Update a Projektarbeit by ID.
-	 */
-	public function updateProjektarbeit()
-	{
-		$projektarbeit_id = $this->input->post('projektarbeit_id');
-
-		if (!$projektarbeit_id || !is_numeric($projektarbeit_id))
-			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Projektarbeit ID']), self::ERROR_TYPE_GENERAL);
-
-		if (!$this->ProjektarbeitModel->hasBerechtigungForProjektarbeit($projektarbeit_id))
-			return $this->_outputAuthError([$this->router->method => ['admin:rw', 'assistenz:rw']]);
-
-		$formData = $this->input->post('formData');
-
-		if ($this->_validate($formData) == false)
-		{
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-		}
-
-		$projektarbeit = $this->_getProjektarbeitArr($formData);
-
-		$result = $this->ProjektarbeitModel->update(
-			$projektarbeit_id,
-			array_merge($projektarbeit, ['updateamum' => date('c'), 'updatevon' => getAuthUID()])
-		);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
-
-	/**
-	 * Delete Projektarbeit by ID after validation.
-	 */
-	public function deleteProjektarbeit()
-	{
-		$projektarbeit_id = $this->input->post('projektarbeit_id');
-
-		if (!isset($projektarbeit_id) || !is_numeric($projektarbeit_id))
-			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Projektarbeit ID'], self::ERROR_TYPE_GENERAL));
-
-		if (!$this->ProjektarbeitModel->hasBerechtigungForProjektarbeit($projektarbeit_id))
-			return $this->_outputAuthError([$this->router->method => ['admin:rw', 'assistenz:rw']]);
-
-		$validate = $this->_validateDelete($projektarbeit_id);
-
-		if (isError($validate)) return $this->terminateWithError(getError($validate), self::ERROR_TYPE_GENERAL);
-
-		$result = $this->ProjektarbeitModel->delete(
-			['projektarbeit_id' => $projektarbeit_id]
-		);
-
-		if (isError($result)) return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-
-		if (!hasData($result))
-		{
-			$this->outputJson($result);
-		}
-
-		return $this->terminateWithSuccess(current(getData($result)) ? : null);
-	}
-
-	/**
-	 * Get all active projekt work types.
-	 */
-	public function getTypenProjektarbeit()
-	{
-		$result = $this->ProjekttypModel->loadWhere(['aktiv' => true]);
-
-		if (isError($result)) return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-
-		return $this->terminateWithSuccess(hasData($result) ? getData($result) : []);
-	}
-
-	/**
-	 * Gets companies by search string.
-	 */
-	public function getFirmen()
-	{
-		$searchString = $this->input->get('searchString');
-
-		if (!isset($searchString))
-			$this->terminateWithError($this->p->t('ui', 'error_fieldRequired', ['field' => 'Search term']), self::ERROR_TYPE_GENERAL);
-
-		$result = $this->FirmaModel->searchFirmen($searchString, $aktiv = true);
-
-		if (isError($result)) return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-
-		return $this->terminateWithSuccess(hasData($result) ? getData($result) : []);
-	}
-
-	/**
-	 * Get Lehrveranstaltungen by params, incling lehreinheiten for a specific Studiensemester..
-	 */
-	public function getLehrveranstaltungen()
-	{
-		$student_uid = $this->input->get('student_uid');
-		$studiengang_kz = $this->input->get('studiengang_kz');
-		$studiensemester_kurzbz = $this->input->get('studiensemester_kurzbz');
-		$additional_lehrveranstaltung_id = $this->input->get('additional_lehrveranstaltung_id');
-
-		if (!isset($student_uid)) $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Student UID']), self::ERROR_TYPE_GENERAL);
-		if (!isset($studiensemester_kurzbz)) $this->terminateWithError('Studiensemster missing', self::ERROR_TYPE_GENERAL);
-
-		// get Lvs
-		$lvsResult = $this->LehrveranstaltungModel->getLvsForProjektarbeit($student_uid, $studiengang_kz, $additional_lehrveranstaltung_id);
-
-		if (isError($lvsResult)) return $this->terminateWithError($lvsResult, self::ERROR_TYPE_GENERAL);
-
-		$lvs = hasData($lvsResult) ? getData($lvsResult) : [];
-
-		foreach ($lvs as $lv)
-		{
-			// add Lehreinheiten for each Lv for the semester
-			$lehreinheiten = $this->LehreinheitModel->getLesForLv(
-				$lv->lehrveranstaltung_id, $studiensemester_kurzbz
-			);
-
-			foreach ($lehreinheiten as $lehreinheit)
-			{
-				if (!isEmptyArray($lehreinheit->lektoren))
-				{
-					$this->MitarbeiterModel->addSelect('kurzbz');
-					$this->MitarbeiterModel->db->where_in('tbl_mitarbeiter.mitarbeiter_uid', $lehreinheit->lektoren);
-					$maResult = $this->MitarbeiterModel->load();
-
-					if (isError($maResult)) return $this->terminateWithError($lvsResult, self::ERROR_TYPE_GENERAL);
-
-					$lehreinheit->lektoren = array_column(getData($maResult), 'kurzbz');
-				}
-			}
-
-			$lv->lehreinheiten = $lehreinheiten;
-		}
-
-		return $this->terminateWithSuccess($lvs);
-	}
-
-	/**
-	 * Get all noten.
-	 */
-	public function getNoten()
-	{
-		$this->NoteModel->addOrder('notenwert', 'ASC');
-		$this->NoteModel->addOrder('bezeichnung', 'ASC');
-
-		$result = $this->NoteModel->load();
-
-		if (isError($result)) return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-
-		return $this->terminateWithSuccess(hasData($result) ? getData($result) : []);
-	}
-
-	/**
-	 * Get all Studiensemester, sorted.
-	 */
-	public function getStudiensemester()
-	{
-		$this->StudiensemesterModel->addOrder('start', 'DESC');
-		$result = $this->StudiensemesterModel->load();
-
-		if (isError($result)) return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-
-		return $this->terminateWithSuccess(hasData($result) ? getData($result) : []);
-	}
-
-	/**
-	 * Validate Projektarbeit data.
-	 * @param formData
-	 * @return bool true if data valid
-	 */
-	private function _validate($formData)
-	{
-		$this->form_validation->set_data($formData);
-
-		$this->form_validation->set_rules('projekttyp_kurzbz', 'Projekttyp', 'required', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Projekttyp'])
-		]);
-
-		$this->form_validation->set_rules('lehreinheit_id', 'Lehreinheit', 'required|is_natural', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Lehreinheit']),
-			'is_natural' =>  $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Lehreinheit'])
-		]);
-
-		$this->form_validation->set_rules('beginn', 'Beginn', 'is_valid_date', [
-			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'Beginn'])
-		]);
-
-		$this->form_validation->set_rules('ende', 'Ende', 'is_valid_date', [
-			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'Ende'])
-		]);
-
-		$this->form_validation->set_rules('gesperrtbis', 'Ende', 'is_valid_date', [
-			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'Gesperrt bis'])
-		]);
-
-		return $this->form_validation->run();
-	}
-
-	/**
-	 * Extract Projektarbeit data from passed form data.
-	 * @param formData
-	 * @return array
-	 */
-	private function _getProjektarbeitArr($formData)
-	{
-		return [
-			'titel' => $formData['titel'],
-			'titel_english' => $formData['titel_english'] ?? null,
-			'themenbereich' => $formData['themenbereich'] ?? null,
-			'projekttyp_kurzbz' => $formData['projekttyp_kurzbz'],
-			'firma_id' => $formData['firma_id'] ?? null,
-			'lehreinheit_id' => $formData['lehreinheit_id'],
-			'beginn' => isset($formData['beginn']) && !isEmptyString($formData['beginn']) ? $formData['beginn'] : null,
-			'ende' => isset($formData['ende']) && !isEmptyString($formData['ende']) ? $formData['ende'] : null,
-			'note' => $formData['note'] ?? null,
-			'final' => $formData['final'] ?? null,
-			'freigegeben' => $formData['freigegeben'] ?? null,
-			'anmerkung' => $formData['anmerkung'] ?? null,
-			'gesperrtbis' => isset($formData['gesperrtbis']) && !isEmptyString($formData['gesperrtbis']) ? $formData['gesperrtbis'] : null
-		];
-	}
-
-	/**
-	 * Check if deletion of a Projektarbeit is possible.
-	 * @param $projektarbeit_id
-	 * @return object success if deletion possible, error otherwise.
-	 */
-	private function _validateDelete($projektarbeit_id)
-	{
-		$this->BetreuerModel->addSelect('1');
-		$result = $this->BetreuerModel->loadWhere(['projektarbeit_id' => $projektarbeit_id]);
-
-		if (isError($result)) return $result;
-
-		if (hasData($result)) return error($this->p->t('projektarbeit', 'error_betreuerNichtGeloescht'));
-
-		$this->PaabgabeModel->addSelect('1');
-		$result = $this->PaabgabeModel->loadWhere(['projektarbeit_id' => $projektarbeit_id]);
-
-		if (isError($result)) return $result;
-
-		if (hasData($result)) return error($this->p->t('projektarbeit', 'error_paabgabeNichtGeloescht'));
-
-		return success();
-	}
-
-	/**
-	 * Checks permissions for a student.
-	 * @param $student_uid
-	 * @return bool true if authorized
-	 */
-	private function _hasBerechtigungForStudent($student_uid)
-	{
-		if (!$student_uid)
-			return false;
-
-		$this->load->model('crm/Student_model', 'StudentModel');
-
-		$this->StudentModel->addSelect('studiengang_kz');
-		$result = $this->StudentModel->load([$student_uid]);
-		if (isError($result) || !hasData($result))
-			return false;
-
-		$studiengang_kz = getData($result)[0]->studiengang_kz;
-
-		if ($this->permissionlib->isBerechtigt('admin', 'suid', $studiengang_kz))
-			return true;
-		if ($this->permissionlib->isBerechtigt('assistenz', 'suid', $studiengang_kz))
-			return true;
-
-		return false;
-	}
-}

application/controllers/api/frontend/v1/stv/Projektbetreuer.php

@@ -1,435 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-use \DateTime as DateTime;
-use \CI3_Events as Events;
-
-class Projektbetreuer extends FHCAPI_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'getProjektbetreuer' => ['admin:r', 'assistenz:r'],
-			'saveProjektbetreuer' => ['admin:rw', 'assistenz:rw'],
-			'deleteProjektbetreuer' => ['admin:rw', 'assistenz:rw'],
-			'getBetreuerarten' => ['admin:r', 'assistenz:r'],
-			'getNoten' => ['admin:r', 'assistenz:r'],
-			'getDefaultStundensaetze' => ['admin:r', 'assistenz:r'],
-			'getProjektbetreuerBySearchQuery' => ['admin:r', 'assistenz:r'],
-			'getPerson' => ['admin:r', 'assistenz:r'],
-			'validateProjektbetreuer' => ['admin:r', 'assistenz:r']
-		]);
-
-		// Load Libraries
-		$this->load->library('form_validation');
-
-		// Load language phrases
-		$this->loadPhrases([
-			'ui',
-			'person',
-			'projektarbeit'
-		]);
-
-		// Load models
-		$this->load->model('education/Projektbetreuer_model', 'ProjektbetreuerModel');
-		$this->load->model('education/Betreuerart_model', 'BetreuerartModel');
-		$this->load->model('ressource/Stundensatz_model', 'StundensatzModel');
-		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
-		$this->load->model('education/Note_model', 'NoteModel');
-		$this->load->model('person/Person_model', 'PersonModel');
-
-		// load libraries
-		$this->load->library('PermissionLib');
-	}
-
-	/**
-	 * Gets Projektbetreuer data for a Projektarbeit.
-	 */
-	public function getProjektbetreuer()
-	{
-		$projektarbeit_id = $this->input->get('projektarbeit_id');
-
-		if (!isset($projektarbeit_id))
-			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Projektarbeit ID']), self::ERROR_TYPE_GENERAL);
-
-		$qry = "
-			SELECT * FROM (
-				SELECT
-					projektarbeit_id, person_id, nachname, vorname, note, punkte, round(stunden, 1) AS stunden,
-					stundensatz, betreuerart_kurzbz, vertrag_id, titelpre, titelpost,
-					CASE
-						WHEN EXISTS
-							(SELECT 1 FROM public.tbl_benutzer JOIN public.tbl_mitarbeiter ON(uid=mitarbeiter_uid) WHERE person_id=pers.person_id)
-						THEN 'Mitarbeiter'
-						WHEN EXISTS
-							(SELECT 1 FROM public.tbl_benutzer JOIN public.tbl_student ON(uid=student_uid) WHERE person_id=pers.person_id)
-						THEN 'Student'
-						ELSE 'Person'
-					END AS status
-				FROM
-					lehre.tbl_projektbetreuer
-					JOIN public.tbl_person pers USING (person_id)
-				WHERE
-					projektarbeit_id = ?
-			) betreuer
-			ORDER BY
-				CASE WHEN status = 'Mitarbeiter' THEN 0 WHEN status = 'Person' THEN 1 ELSE 2 END";
-
-		$result = $this->ProjektbetreuerModel->execReadOnlyQuery($qry, [$projektarbeit_id]);
-
-		if (isError($result)) $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-
-		if (!hasData($result)) $this->terminateWithSuccess([]);
-
-		$projektbetreuer = getData($result);
-
-		//~ foreach ($projektbetreuer as $projektarbeit)
-		//~ {
-			//~ $projektarbeit_id = $projektarbeit->projektarbeit_id;
-			//~ $abgabeRes = $this->PaabgabeModel->getEndabgabe($projektarbeit_id);
-
-			//~ if (isError($abgabeRes)) $this->terminateWithError(getError($abgabeRes), self::ERROR_TYPE_GENERAL);
-
-			//~ if (hasData($abgabeRes))
-			//~ {
-				//~ $paabgabe = getData($abgabeRes)[0];
-				//~ $projektarbeit->abgabedatum = $paabgabe->abgabedatum;
-			//~ }
-		//~ }
-
-		// add thesis download link (from external extension)
-		foreach ($projektbetreuer as $pb)
-		{
-			$downloadLink = null;
-			Events::trigger(
-				'projektbeurteilung_download_link',
-				$pb->projektarbeit_id,
-				$pb->betreuerart_kurzbz,
-				$pb->person_id,
-				function ($value) use (&$downloadLink) {
-					$downloadLink = $value;
-				}
-			);
-			$pb->beurteilungDownloadLink = $downloadLink;
-		}
-
-		$this->terminateWithSuccess($this->_addFullNameToBetreuer($projektbetreuer));
-	}
-
-	/**
-	 * Saves (adds or updates) a single Projektbetreuer for a Projektarbeit.
-	 */
-	public function saveProjektbetreuer()
-	{
-		$projektarbeit_id = $this->input->post('projektarbeit_id');
-
-		if (!isset($projektarbeit_id) || !is_numeric($projektarbeit_id))
-			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Projektarbeit ID']), self::ERROR_TYPE_GENERAL);
-
-		if (!$this->ProjektarbeitModel->hasBerechtigungForProjektarbeit($projektarbeit_id))
-			return $this->_outputAuthError([$this->router->method => ['admin:rw', 'assistenz:rw']]);
-
-		$projektbetreuer = $this->input->post('projektbetreuer');
-
-		if ($this->_validate($projektbetreuer) == false) $this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		// check if assessor has already been assigned
-		if (isset($projektbetreuer['person_id']))
-		{
-			$this->ProjektbetreuerModel->addSelect('1');
-			$betreuerRes = $this->ProjektbetreuerModel->loadWhere(
-				[
-					'person_id' => $projektbetreuer['person_id'],
-					'projektarbeit_id' => $projektbetreuer['projektarbeit_id'],
-					'betreuerart_kurzbz' => $projektbetreuer['betreuerart_kurzbz']
-				]
-			);
-
-			if (hasData($betreuerRes)
-				&& (!isset($projektbetreuer['person_id_old']) || $projektbetreuer['person_id'] != $projektbetreuer['person_id_old'])) {
-				return $this->terminateWithError($this->p->t('projektarbeit', 'betreuerZugewiesen'), self::ERROR_TYPE_GENERAL);
-			}
-		}
-
-		$result = null;
-
-		$stunden = isset($projektbetreuer['stunden']) && !isEmptyString($projektbetreuer['stunden']) ? $projektbetreuer['stunden'] : null;
-		$stundensatz =
-			isset($projektbetreuer['stundensatz']) && !isEmptyString($projektbetreuer['stundensatz']) ? $projektbetreuer['stundensatz'] : null;
-
-		$betreuer = [
-			'projektarbeit_id' => $projektarbeit_id,
-			'person_id' => $projektbetreuer['person_id'],
-			'note' => $projektbetreuer['note'],
-			'stunden' => $stunden,
-			'stundensatz' => $stundensatz,
-			'betreuerart_kurzbz' => $projektbetreuer['betreuerart_kurzbz']
-		];
-
-		if (isset($projektbetreuer['person_id_old']) && isset($projektbetreuer['betreuerart_kurzbz_old']))
-		{
-			$result = $this->ProjektbetreuerModel->update(
-				[
-					'projektarbeit_id' => $projektarbeit_id,
-					'person_id' => $projektbetreuer['person_id_old'],
-					'betreuerart_kurzbz' => $projektbetreuer['betreuerart_kurzbz_old']
-				],
-				array_merge($betreuer, ['updateamum' => date('c'), 'updatevon' => getAuthUID()])
-			);
-		}
-		else
-		{
-			$result = $this->ProjektbetreuerModel->insert(
-				array_merge($betreuer, ['insertamum' => date('c'), 'insertvon' => getAuthUID()])
-			);
-		}
-
-		if (isError($result)) $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-
-		$this->terminateWithSuccess(hasData($result) ? getData($result) : []);
-	}
-
-	/**
-	 * Delete a Projektbetreuer assignment to a Projektarbeit.
-	 */
-	public function deleteProjektbetreuer()
-	{
-		$projektarbeit_id = $this->input->post('projektarbeit_id');
-		$person_id = $this->input->post('person_id');
-		$betreuerart_kurzbz = $this->input->post('betreuerart_kurzbz');
-
-		if (!isset($projektarbeit_id) || !is_numeric($projektarbeit_id))
-		{
-			return $this->terminateWithError(
-				$this->p->t('ui', 'error_missingId', ['id'=> $this->p->t('projektarbeit', 'projektarbeit').' ID'], self::ERROR_TYPE_GENERAL)
-			);
-		}
-
-		if (!isset($person_id) || !is_numeric($person_id))
-			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Person ID'], self::ERROR_TYPE_GENERAL));
-
-		if (!isset($betreuerart_kurzbz))
-		{
-			return $this->terminateWithError(
-				$this->p->t('ui', 'error_missingId', ['id'=> $this->p->t('projektarbeit', 'betreuerart')], self::ERROR_TYPE_GENERAL)
-			);
-		}
-
-		// check permission
-		if (!$this->ProjektarbeitModel->hasBerechtigungForProjektarbeit($projektarbeit_id))
-			return $this->_outputAuthError([$this->router->method => ['admin:rw', 'assistenz:rw']]);
-
-		$validate = $this->_validateDelete($projektarbeit_id, $person_id, $betreuerart_kurzbz);
-
-		if (isError($validate)) return $this->terminateWithError(getError($validate), self::ERROR_TYPE_GENERAL);
-
-		// check if there is a Projektarbeitsbeurteilung - if yes, it is handled (possibly deleted) by external extension.
-		$beurteilungDeleteSuccess = true;
-
-		Events::trigger(
-			'projektarbeitsbeurteilung_delete',
-			$projektarbeit_id,
-			function ($value) use (&$beurteilungDeleteSuccess) {
-				$beurteilungDeleteSuccess = $value;
-			}
-		);
-
-		// if there is still a Beurteilung, Projektarbeit cannot be deleted - return with error
-		if (!$beurteilungDeleteSuccess) return $this->terminateWithError($this->p->t('projektarbeit', 'error_paarbeitHatBeurteilung'));
-
-		$result = $this->ProjektbetreuerModel->delete(
-			['projektarbeit_id' => $projektarbeit_id, 'person_id' => $person_id, 'betreuerart_kurzbz' => $betreuerart_kurzbz]
-		);
-
-		if (isError($result)) return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-
-		if (!hasData($result))
-		{
-			$this->outputJson($result);
-		}
-
-		return $this->terminateWithSuccess(getData($result));
-	}
-
-	/**
-	 * Get all active Betreuerarten.
-	 */
-	public function getBetreuerarten()
-	{
-		$result = $this->BetreuerartModel->loadWhere(['aktiv' => true]);
-
-		if (isError($result)) return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-
-		return $this->terminateWithSuccess(hasData($result) ? getData($result) : []);
-	}
-
-	/**
-	 * Get all Noten.
-	 */
-	public function getNoten()
-	{
-		$result = $this->NoteModel->load();
-
-		if (isError($result)) return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-
-		return $this->terminateWithSuccess(hasData($result) ? getData($result) : []);
-	}
-
-	/**
-	 * Get default Stundensätze for an employee in a semester.
-	 */
-	public function getDefaultStundensaetze()
-	{
-		$person_id = $this->input->get('person_id');
-		$studiensemester_kurzbz = $this->input->get('studiensemester_kurzbz');
-
-		$result = $this->StundensatzModel->getStundensatzForMitarbeiter($person_id, $studiensemester_kurzbz);
-
-		return $this->terminateWithSuccess($result);
-	}
-
-	/**
-	 * Get all Projektbetreuer by search string.
-	 */
-	public function getProjektbetreuerBySearchQuery()
-	{
-		$searchString = $this->input->get('searchString');
-
-		if (!isset($searchString))
-			$this->terminateWithError($this->p->t('ui', 'error_fieldRequired', ['field' => 'Search term']), self::ERROR_TYPE_GENERAL);
-
-		$result = $this->PersonModel->searchPerson($searchString);
-
-		if (isError($result)) return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-
-		if (!hasData($result)) $this->terminateWithSuccess([]);
-
-		$persons = $this->_addFullNameToBetreuer(getData($result));
-
-		// sort persons by type (employees first)
-		usort($persons, function ($a, $b) {
-			$statusRanks = ['Mitarbeiter' => 0, 'Person' => 1, 'Student' => 2];
-			return (isset($statusRanks[$a->status]) ? $statusRanks[$a->status] : count($statusRanks) + 1)
-				- (isset($statusRanks[$b->status]) ? $statusRanks[$b->status] : count($statusRanks) + 1);
-		});
-
-		return $this->terminateWithSuccess($persons);
-	}
-
-	/**
-	 * Get person info by Id.
-	 */
-	public function getPerson()
-	{
-		$person_id = $this->input->get('person_id');
-
-		if (!isset($person_id))
-			$this->terminateWithError($this->p->t('ui', 'error_fieldRequired', ['field' => 'Person']), self::ERROR_TYPE_GENERAL);
-
-		$this->PersonModel->addSelect("CASE
-				WHEN EXISTS
-					(SELECT 1 FROM public.tbl_benutzer JOIN public.tbl_mitarbeiter ON(uid=mitarbeiter_uid) WHERE person_id=tbl_person.person_id)
-				THEN 'Mitarbeiter'
-				WHEN EXISTS
-					(SELECT 1 FROM public.tbl_benutzer JOIN public.tbl_student ON(uid=student_uid) WHERE person_id=tbl_person.person_id)
-				THEN 'Student'
-				ELSE 'Person'
-			END AS status");
-		$result = $this->PersonModel->addSelect('titelpre, titelpost, vorname, nachname, person_id');
-		$result = $this->PersonModel->load($person_id);
-
-		if (isError($result)) return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-
-		return $this->terminateWithSuccess(hasData($result) ? $this->_addFullNameToBetreuer(getData($result))[0] : []);
-	}
-
-	/**
-	 * Validate list of Projektbetreuer.
-	 */
-	public function validateProjektbetreuer()
-	{
-		$projektbetreuerArr = $this->input->post('projektbetreuer');
-
-		if (!is_array($projektbetreuerArr)) $projektbetreuerArr = [$projektbetreuerArr];
-
-		foreach ($projektbetreuerArr as $pb)
-		{
-			if ($this->_validate($pb) == false)
-			{
-				$this->terminateWithValidationErrors($this->form_validation->error_array());
-			}
-		}
-
-		$this->terminateWithSuccess([]);
-	}
-
-	/**
-	 * Validation funciton for checking Projektbetreuer input.
-	 * @param $formData Betreuer data
-	 * @return bool true when data is valid
-	 */
-	private function _validate($formData)
-	{
-		$this->form_validation->set_data($formData);
-
-		$this->form_validation->set_rules('betreuerart_kurzbz', 'Betreuerart', 'required', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('projektarbeit', 'betreuerart')])
-		]);
-
-		$this->form_validation->set_rules('person_id', 'Person', 'required', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('projektarbeit', 'betreuer')])
-		]);
-
-		$this->form_validation->set_rules('stunden', 'Stunden', 'numeric', [
-			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' => $this->p->t('projektarbeit', 'stunden')])
-		]);
-
-		$this->form_validation->set_rules('stundensatz', 'Stundensatz', 'numeric', [
-			'numeric' => $this->p->t('ui', 'error_fieldNotNumeric', ['field' =>  $this->p->t('projektarbeit', 'stundensatz')])
-		]);
-
-
-		return $this->form_validation->run();
-	}
-
-	/**
-	 * Check possibility of deletion of a Projektbetreuer.
-	 * @param projektarbeit_id
-	 * @param person_id
-	 * @param betreuerart_kurzbz
-	 * @return object success when delete possible, error otherwise
-	 */
-	private function _validateDelete($projektarbeit_id, $person_id, $betreuerart_kurzbz)
-	{
-		// check if contract exists
-		$this->ProjektbetreuerModel->addSelect('vertrag_id');
-		$result = $this->ProjektbetreuerModel->loadWhere(
-			['projektarbeit_id' => $projektarbeit_id, 'person_id' => $person_id, 'betreuerart_kurzbz' => $betreuerart_kurzbz]
-		);
-
-		if (isError($result)) return $result;
-
-		// if contract exists, no deletion is possible
-		if (hasData($result) && getData($result)[0]->vertrag_id != null) return error($this->p->t('projektarbeit', 'error_betreuerHatVertrag'));
-
-		return success();
-	}
-
-	/**
-	 * Add full name to array with Betreuer.
-	 * @param $betreuerArr
-	 * @return array including Betreuer with their full names
-	 */
-	private function _addFullNameToBetreuer($betreuerArr)
-	{
-		foreach ($betreuerArr as $betreuer)
-		{
-			$betreuer->name = ($betreuer->titelpre ? $betreuer->titelpre . ' ' : '') .
-				$betreuer->nachname . ' ' . $betreuer->vorname . ($betreuer->titelpost ? ' ' . $betreuer->titelpre : '').
-				' (' . $betreuer->status . ')';
-		}
-
-		return $betreuerArr;
-	}
-}

application/controllers/api/frontend/v1/stv/Pruefung.php

@@ -18,8 +18,6 @@
 
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
-use \DateTime as DateTime;
-
 /**
  * This controller operates between (interface) the JS (GUI) and the back-end
  * Provides data to the ajax get calls about addresses
@@ -113,7 +111,7 @@ class Pruefung extends FHCAPI_Controller
 
 		// Load language phrases
 		$this->loadPhrases([
-			'global', 'ui', 'lehre', 'exam'
+			'global', 'ui','lehre'
 		]);
 	}
 
@@ -174,11 +172,174 @@ class Pruefung extends FHCAPI_Controller
 	 *
 	 * @param lehrveranstaltung_id, student_uid, lehreinheit_id
 	 *
-	 * @return void
+	 * @return values on success
+	 * 			retval 0: pruefung inserted
+	 * 			reval 1: pruefung and zeugnisnote inserted
+	 * 			retval 2: pruefung inserted, no insert Zeugnisnote
+	 * 					(change after date of examination)
+	 * 			retval 3: pruefung of type Termin2 inserted
+	 * 						and pruefung of type Termin1 as well
+	 *			retval 5: prueufungen Termin 2 and 1 inserted
+	 * 						and no insert Zeugnisnote (change after date of examination)
 	 */
 	public function insertPruefung()
 	{
-		$this->insertOrUpdatePruefung();
+		$authUID = getAuthUID();
+
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('lehrveranstaltung_id', $this->p->t('lehre', 'lehrveranstaltung'), 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('lehre', 'lehrveranstaltung')]),
+		]);
+		$this->form_validation->set_rules('lehreinheit_id', $this->p->t('lehre', 'lehreinheit'), 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('lehre', 'lehreinheit')]),
+		]);
+		$this->form_validation->set_rules('pruefungstyp_kurzbz', $this->p->t('lehre', 'pruefung'), 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('global', 'typ')]),
+		]);
+		$this->form_validation->set_rules(
+			'datum',
+			$this->p->t('global', 'datum'),
+			['is_valid_date']
+		);
+
+		if ($this->form_validation->run() == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		//calculate studiensemester_kurzbz this from lehreinheit (case newPruefung)
+		$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
+		if (!$studiensemester_kurzbz)
+		{
+			$this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
+
+			$result = $this->LehreinheitModel->load($this->input->post('lehreinheit_id'));
+
+			$lehreinheit = $this->getDataOrTerminateWithError($result);
+			$studiensemester_kurzbz = current($lehreinheit)->studiensemester_kurzbz;
+
+			if (isError($result))
+			{
+				$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			}
+		}
+
+		$result = $this->PruefungModel->insert([
+			'lehreinheit_id' => $this->input->post('lehreinheit_id'),
+			'student_uid' => $this->input->post('student_uid'),
+			'mitarbeiter_uid' => $this->input->post('mitarbeiter_uid'),
+			'datum' => $this->input->post('datum'),
+			'pruefungstyp_kurzbz' => $this->input->post('pruefungstyp_kurzbz'),
+			'note' => $this->input->post('note'),
+			'anmerkung' => $this->input->post('anmerkung'),
+			'insertamum' => date('c'),
+			'insertvon' => $authUID,
+		]);
+
+		$this->getDataOrTerminateWithError($result);
+
+		//check if existing zeugnisnote
+		$this->load->model('education/Zeugnisnote_model', 'ZeugnisnoteModel');
+
+		$result = $this->ZeugnisnoteModel->loadWhere(array(
+			'lehrveranstaltung_id' => $this->input->post('lehrveranstaltung_id'),
+			'student_uid' => $this->input->post('student_uid'),
+			'studiensemester_kurzbz' => $studiensemester_kurzbz));
+
+		if (isError($result))
+		{
+			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+		}
+
+		if (!hasData($result))
+		{
+			//insert zeugnisnote, if not existing
+			$result = $this->ZeugnisnoteModel->insert(array(
+				'lehrveranstaltung_id' => $this->input->post('lehrveranstaltung_id'),
+				'student_uid' => $this->input->post('student_uid'),
+				'studiensemester_kurzbz' => $studiensemester_kurzbz,
+				'note' => $this->input->post('note'),
+				'uebernahmedatum' => date('c'),
+				'benotungsdatum' => $this->input->post('datum'),
+				'insertamum' => date('c'),
+				'insertvon' =>  $authUID
+			));
+
+			if (isError($result))
+			{
+				$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			}
+			$this->terminateWithSuccess(1);
+		}
+
+		$return_code = 0;
+
+		//handling Termin1 if not existing
+		if($this->input->post('pruefungstyp_kurzbz') == "Termin2")
+		{
+			$resultP = $this->PruefungModel->loadWhere(array(
+				'lehreinheit_id' => $this->input->post('lehreinheit_id'),
+				'student_uid' => $this->input->post('student_uid'),
+				'pruefungstyp_kurzbz' => 'Termin1'));
+
+			if (isError($resultP))
+			{
+				$this->terminateWithError(getError($resultP), self::ERROR_TYPE_GENERAL);
+			}
+			if(!hasData($resultP))
+			{
+				//check if existing Zeugnisnote
+				$this->load->model('education/Zeugnisnote_model', 'ZeugnisnoteModel');
+				$this->ZeugnisnoteModel->addJoin('lehre.tbl_lehreinheit', 'lehrveranstaltung_id');
+
+				$resultP = $this->ZeugnisnoteModel->loadWhere(array(
+					'lehrveranstaltung_id' => $this->input->post('lehrveranstaltung_id'),
+					'student_uid' => $this->input->input->post('student_uid'),
+					'lehre.tbl_zeugnisnote.studiensemester_kurzbz' => $studiensemester_kurzbz));
+				if (isError($resultP))
+				{
+					$this->terminateWithError(getError($resultP), self::ERROR_TYPE_GENERAL);
+				}
+				if (!hasData($resultP))
+				{
+					$this->terminateWithError("Zeugnisnote existiert nicht", self::ERROR_TYPE_GENERAL);
+				}
+				$dataNote = current(getData($resultP));
+
+				$resultN = $this->PruefungModel->insert([
+					'lehreinheit_id' => $this->input->post('lehreinheit_id'),
+					'student_uid' => $this->input->post('student_uid'),
+					'mitarbeiter_uid' => $this->input->post('mitarbeiter_uid'),
+					'datum' => $dataNote->benotungsdatum,
+					'pruefungstyp_kurzbz' => 'Termin1',
+					'note' => $dataNote->note,
+					'punkte' => $dataNote->punkte,
+					'anmerkung' => 'automatisiert aus Zeugnisnote erstellt',
+					'insertamum' => date('c'),
+					'insertvon' => $authUID,
+				]);
+
+				if (isError($resultN)) {
+					$this->terminateWithError(getError($resultN), self::ERROR_TYPE_GENERAL);
+				}
+				$return_code = 3;
+			}
+		}
+
+		$note = current(getData($result));
+		$uebernahmedatum = new DateTime($note->uebernahmedatum);
+		$benotungsdatum = new DateTime($note->benotungsdatum);
+
+		$checkDate = $uebernahmedatum  === '' || $benotungsdatum  > $uebernahmedatum
+			? $benotungsdatum
+			: $uebernahmedatum;
+
+		if ($checkDate >= $this->input->post('datum') && $note !== $note->note)
+		{
+			$this->terminateWithSuccess($return_code + 2);
+		}
+		$this->terminateWithSuccess($return_code + 2);
 	}
 
 	/**
@@ -187,6 +348,8 @@ class Pruefung extends FHCAPI_Controller
 	 * @param pruefung_id
 	 *
 	 * @return success or error
+	 *
+	 * no impact on lehre.tbl_zeugnisnote
 	 */
 	public function updatePruefung($pruefung_id)
 	{
@@ -196,7 +359,48 @@ class Pruefung extends FHCAPI_Controller
 		if (!$oldpruefung)
 			show_404(); // Pruefung that should be updated does not exist
 
-		$this->insertOrUpdatePruefung($pruefung_id);
+		$authUID = getAuthUID();
+
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('lehrveranstaltung_id', $this->p->t('lehre', 'lehrveranstaltung'), 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('lehre', 'lehrveranstaltung')]),
+		]);
+		$this->form_validation->set_rules('lehreinheit_id', $this->p->t('lehre', 'lehreinheit'), 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('lehre', 'lehreinheit')]),
+		]);
+		$this->form_validation->set_rules('pruefungstyp_kurzbz', $this->p->t('lehre', 'pruefung'), 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('global', 'typ')]),
+		]);
+		$this->form_validation->set_rules(
+			'datum',
+			$this->p->t('global', 'datum'),
+			['is_valid_date']
+		);
+
+		if ($this->form_validation->run() == false)
+		{
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+		}
+
+		$result = $this->PruefungModel->update(
+			[
+				'pruefung_id' => $pruefung_id
+			],
+			[	'lehreinheit_id' => $this->input->post('lehreinheit_id'),
+				'student_uid' =>  $this->input->post('student_uid'),
+				'mitarbeiter_uid' =>  $this->input->post('mitarbeiter_uid'),
+				'note' => $this->input->post('note'),
+				'pruefungstyp_kurzbz' => $this->input->post('pruefungstyp_kurzbz'),
+				'datum' => $this->input->post('datum'),
+				'anmerkung' => $this->input->post('anmerkung'),
+				'updatevon' => $authUID,
+				'updateamum' => date('c'),
+			]
+		);
+		$this->getDataOrTerminateWithError($result);
+
+		return $this->outputJsonSuccess(true);
 	}
 
 	/**
@@ -370,198 +574,4 @@ class Pruefung extends FHCAPI_Controller
 
 		return $this->terminateWithSuccess($data);
 	}
-
-	protected function insertOrUpdatePruefung($pruefung_id=null)
-	{
-		$authUID = getAuthUID();
-
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules('lehreinheit_id', $this->p->t('lehre', 'lehreinheit'), 'required', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('lehre', 'lehreinheit')]),
-		]);
-		$this->form_validation->set_rules('pruefungstyp_kurzbz', $this->p->t('lehre', 'pruefung'), 'required', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('global', 'typ')]),
-		]);
-		$this->form_validation->set_rules(
-			'datum',
-			$this->p->t('global', 'datum'),
-			['is_valid_date']
-		);
-
-		if ($this->form_validation->run() == false)
-		{
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-		}
-
-		$this->load->model('education/Zeugnisnote_model', 'ZeugnisnoteModel');
-
-		$this->PruefungModel->db->trans_start();
-
-		if ($this->input->post('pruefungstyp_kurzbz') == "Termin2")
-		{
-			//Wenn ein 2. Termin angelegt wird, und kein 1. Termin vorhanden ist,
-			//dann wird auch ein 1. Termin angelegt mit der derzeitigen Zeugnisnote
-			$resultP = $this->PruefungModel->loadWhere(array(
-				'lehreinheit_id' => $this->input->post('lehreinheit_id'),
-				'student_uid' => $this->input->post('student_uid'),
-				'pruefungstyp_kurzbz' => 'Termin1'));
-
-			$termin1 = $this->getDataOrTerminateWithError($resultP);
-			if (!$termin1)
-			{
-				//check if existing Zeugnisnote
-				$this->ZeugnisnoteModel->addJoin('lehre.tbl_lehreinheit', 'lehrveranstaltung_id');
-
-				$this->ZeugnisnoteModel->db->where(
-					'lehre.tbl_zeugnisnote.studiensemester_kurzbz',
-					'lehre.tbl_lehreinheit.studiensemester_kurzbz',
-					false
-				);
-				$resultP = $this->ZeugnisnoteModel->loadWhere(array(
-					'lehrveranstaltung_id' => $this->input->post('lehrveranstaltung_id'),
-					'student_uid' => $this->input->post('student_uid')
-				));
-
-				$zeugnisnoten = $this->getDataOrTerminateWithError($resultP);
-				if ($zeugnisnoten)
-				{
-					$zeugnisnote = current($zeugnisnoten);
-
-					$resultN = $this->PruefungModel->insert([
-						'lehreinheit_id' => $this->input->post('lehreinheit_id'),
-						'student_uid' => $this->input->post('student_uid'),
-						'mitarbeiter_uid' => $this->input->post('mitarbeiter_uid'),
-						'datum' => $zeugnisnote->benotungsdatum,
-						'pruefungstyp_kurzbz' => 'Termin1',
-						'note' => $zeugnisnote->note,
-						'punkte' => $zeugnisnote->punkte,
-						'anmerkung' => 'automatisiert aus Zeugnisnote erstellt',
-						'insertamum' => date('c'),
-						'insertvon' => $authUID,
-					]);
-
-					$this->getDataOrTerminateWithError($resultN);
-				}
-				//Wenn keine Zeugnisnote vorhanden ist, dann wird kein
-				//1.Termin angelegt
-			}
-		}
-
-		if(intval($pruefung_id) > 0)
-		{
-			$result = $this->PruefungModel->update(
-				[
-					'pruefung_id' => $pruefung_id
-				],
-				[	'lehreinheit_id' => $this->input->post('lehreinheit_id'),
-					'student_uid' =>  $this->input->post('student_uid'),
-					'mitarbeiter_uid' =>  $this->input->post('mitarbeiter_uid'),
-					'note' => $this->input->post('note'),
-					'pruefungstyp_kurzbz' => $this->input->post('pruefungstyp_kurzbz'),
-					'datum' => $this->input->post('datum'),
-					'anmerkung' => $this->input->post('anmerkung'),
-					'updatevon' => $authUID,
-					'updateamum' => date('c'),
-				]
-			);
-		}
-		else
-		{
-			$result = $this->PruefungModel->insert([
-				'lehreinheit_id' => $this->input->post('lehreinheit_id'),
-				'student_uid' => $this->input->post('student_uid'),
-				'mitarbeiter_uid' => $this->input->post('mitarbeiter_uid'),
-				'datum' => $this->input->post('datum'),
-				'pruefungstyp_kurzbz' => $this->input->post('pruefungstyp_kurzbz'),
-				'note' => $this->input->post('note'),
-				'anmerkung' => $this->input->post('anmerkung'),
-				'insertamum' => date('c'),
-				'insertvon' => $authUID,
-				'punkte' => $this->input->post('punkte') ? str_replace(',', '.', $this->input->post('punkte')) : null
-			]);
-		}
-
-		$this->getDataOrTerminateWithError($result);
-
-		//get studiensemester_kurzbz and lehreveranstaltung_id from lehreinheit
-		$this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
-
-		$result = $this->LehreinheitModel->load($this->input->post('lehreinheit_id'));
-
-		$lehreinheiten = $this->getDataOrTerminateWithError($result);
-
-		if (!$lehreinheiten) {
-			$this->terminateWithValidationErrors([
-				'lehreinheit_id' => $this->p->t('ui', 'error_fieldNotFound', [
-					'field' => $this->p->t('lehre', 'lehreinheit')
-				])
-			]);
-		}
-		$lehreinheit = current($lehreinheiten);
-		$studiensemester_kurzbz = $lehreinheit->studiensemester_kurzbz;
-		$lehrveranstaltung_id = $lehreinheit->lehrveranstaltung_id;
-
-		//check if existing zeugnisnote
-		$result = $this->ZeugnisnoteModel->loadWhere(array(
-			'lehrveranstaltung_id' => $lehrveranstaltung_id,
-			'student_uid' => $this->input->post('student_uid'),
-			'studiensemester_kurzbz' => $studiensemester_kurzbz
-		));
-
-		$zeugnisnoten = $this->getDataOrTerminateWithError($result);
-
-		if (!$zeugnisnoten)
-		{
-			//insert zeugnisnote, if not existing
-			$result = $this->ZeugnisnoteModel->insert(array(
-				'lehrveranstaltung_id' => $lehrveranstaltung_id,
-				'student_uid' => $this->input->post('student_uid'),
-				'studiensemester_kurzbz' => $studiensemester_kurzbz,
-				'note' => $this->input->post('note'),
-				'uebernahmedatum' => date('c'),
-				'benotungsdatum' => $this->input->post('datum'),
-				'insertamum' => date('c'),
-				'insertvon' =>  $authUID,
-				'punkte' => $this->input->post('punkte') ? str_replace(',', '.', $this->input->post('punkte')) : null
-			));
-
-			$this->getDataOrTerminateWithError($result);
-
-			$this->PruefungModel->db->trans_complete();
-			$this->terminateWithSuccess();
-		}
-
-		$note = current($zeugnisnoten);
-		$uebernahmedatum = new DateTime($note->uebernahmedatum);
-		$benotungsdatum = new DateTime($note->benotungsdatum);
-		$pruefungsdatum = new DateTime($this->input->post('datum'));
-
-		$checkDate = $note->uebernahmedatum === '' || $benotungsdatum > $uebernahmedatum
-			? $benotungsdatum
-			: $uebernahmedatum;
-
-		if ($checkDate > $pruefungsdatum && $this->input->post('note') !== $note->note)
-		{
-			$this->PruefungModel->db->trans_complete();
-			$this->terminateWithSuccess($this->p->t('exam', 'hinweis_changeAfterExamDate'));
-		}
-
-		//update zeugnisnote, if existing and valid datum
-		$result = $this->ZeugnisnoteModel->update([
-			'lehrveranstaltung_id' => $lehrveranstaltung_id,
-			'student_uid' => $this->input->post('student_uid'),
-			'studiensemester_kurzbz' => $studiensemester_kurzbz
-		], [
-			'note' => $this->input->post('note'),
-			'uebernahmedatum' => date('c'),
-			'benotungsdatum' => $this->input->post('datum'),
-			'updateamum' => date('c'),
-			'updatevon' =>  $authUID,
-			'punkte' => $this->input->post('punkte') ? str_replace(',', '.', $this->input->post('punkte')) : null
-		]);
-
-		$this->PruefungModel->db->trans_complete();
-		$this->terminateWithSuccess();
-	}
 }

application/controllers/api/frontend/v1/stv/Status.php

@@ -114,8 +114,9 @@ class Status extends FHCAPI_Controller
 		$this->load->model('codex/Bismeldestichtag_model', 'BismeldestichtagModel');
 
 		$result = $this->BismeldestichtagModel->getLastReachedMeldestichtag();
+		$data = $this->getDataOrTerminateWithError($result);
 
-		$this->terminateWithSuccess(hasData($result) ? getData($result) : array());
+		$this->terminateWithSuccess($data);
 	}
 
 	public function isLastStatus($prestudent_id)
@@ -295,7 +296,7 @@ class Status extends FHCAPI_Controller
 			}],
 			//Check if Rolle already exists
 			['rolle_doesnt_exist', function () use ($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester) {
-				if (!$status_kurzbz || !$studiensemester_kurzbz || !isset($ausbildungssemester) || $ausbildungssemester === '')
+				if (!$status_kurzbz || !$studiensemester_kurzbz || !$ausbildungssemester)
 					return true; // Error will be handled by the required statements above
 
 				$result = $this->PrestudentstatusModel->load([$ausbildungssemester, $studiensemester_kurzbz, $status_kurzbz, $prestudent_id]);
@@ -902,7 +903,7 @@ class Status extends FHCAPI_Controller
 
 		$this->form_validation->set_rules('_default', '', [
 			['rolle_doesnt_exist', function () use ($prestudent_id, $status_kurzbz, $studiensemester_kurzbz, $ausbildungssemester) {
-				if (!$status_kurzbz || !$studiensemester_kurzbz || !isset($ausbildungssemester) || $ausbildungssemester === '')
+				if (!$status_kurzbz || !$studiensemester_kurzbz || !$ausbildungssemester)
 					return true; // Error will be handled by the required statements above
 
 				$result = $this->PrestudentstatusModel->load([$ausbildungssemester, $studiensemester_kurzbz, $status_kurzbz, $prestudent_id]);
@@ -919,7 +920,7 @@ class Status extends FHCAPI_Controller
 			) {
 				if ($isBerechtigtNoStudstatusCheck)
 					return true; // Skip if access right says so
-				if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !isset($ausbildungssemester) || $ausbildungssemester === '')
+				if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester)
 					return true; // Error will be handled by the required statements above
 
 				$result = $this->prestudentstatuschecklib->checkStatusHistoryTimesequence(
@@ -944,7 +945,7 @@ class Status extends FHCAPI_Controller
 			) {
 				if ($isBerechtigtNoStudstatusCheck)
 					return true; // Skip if access right says so
-				if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !isset($ausbildungssemester) || $ausbildungssemester === '')
+				if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester)
 					return true; // Error will be handled by the required statements above
 
 				$result = $this->prestudentstatuschecklib->checkStatusHistoryLaststatus(
@@ -969,7 +970,7 @@ class Status extends FHCAPI_Controller
 			) {
 				if ($isBerechtigtNoStudstatusCheck)
 					return true; // Skip if access right says so
-				if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !isset($ausbildungssemester) || $ausbildungssemester === '')
+				if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester)
 					return true; // Error will be handled by the required statements above
 
 				$result = $this->prestudentstatuschecklib->checkStatusHistoryUnterbrechersemester(
@@ -994,7 +995,7 @@ class Status extends FHCAPI_Controller
 			) {
 				if ($isBerechtigtNoStudstatusCheck)
 					return true; // Skip if access right says so
-				if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !isset($ausbildungssemester) || $ausbildungssemester === '')
+				if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester)
 					return true; // Error will be handled by the required statements above
 
 				$result = $this->prestudentstatuschecklib->checkStatusHistoryAbbrechersemester(
@@ -1019,7 +1020,7 @@ class Status extends FHCAPI_Controller
 			) {
 				if ($isBerechtigtNoStudstatusCheck)
 					return true; // Skip if access right says so
-				if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !isset($ausbildungssemester) || $ausbildungssemester === '')
+				if (!$status_kurzbz || !$datum || !$studiensemester_kurzbz || !$ausbildungssemester)
 					return true; // Error will be handled by the required statements above
 
 				$result = $this->prestudentstatuschecklib->checkStatusHistoryDiplomant(
@@ -1078,24 +1079,6 @@ class Status extends FHCAPI_Controller
 		$this->terminateWithSuccess(true);
 	}
 
-	protected function checkForCriticalChangesBis($oldstatus)
-	{
-		$changedFields = array();
-		$allowedFields = array('anmerkung', 'statusgrund_id');
-		$oldstatus_array = get_object_vars($oldstatus);
-		foreach($oldstatus_array as $key => $oldValue)
-		{
-			$newValue = $this->input->post($key);
-			if( $newValue !== $oldValue )
-			{
-				$changedFields[] = $key;
-			}
-		}
-		$criticalFieldsChanged = array_diff($changedFields, $allowedFields);
-		$hasCriticalChangesBis = count($criticalFieldsChanged) > 0 ? true : false;
-		return $hasCriticalChangesBis;
-	}
-
 	/**
 	 * Updates a status entry
 	 *
@@ -1120,7 +1103,6 @@ class Status extends FHCAPI_Controller
 
 		$oldstatus = current($oldstatus);
 
-		$hasCriticalChangesBis = $this->checkForCriticalChangesBis($oldstatus);
 
 		$isBerechtigtNoStudstatusCheck =  $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung');
 		$isBerechtigtBasisPrestudentstatus = $this->permissionlib->isBerechtigt('basis/prestudentstatus');
@@ -1131,6 +1113,7 @@ class Status extends FHCAPI_Controller
 		$ausbildungssemester = $this->input->post('ausbildungssemester') ?: $oldstatus->ausbildungssemester;
 		$datum = $this->input->post('datum') ?: $oldstatus->datum;
 
+
 		//Form Validation
 		$this->load->library('form_validation');
 
@@ -1153,15 +1136,9 @@ class Status extends FHCAPI_Controller
 			$this->p->t('global', 'datum'),
 			[
 				'is_valid_date',
-				['meldestichtag_not_exceeded', function ($value) use ($isBerechtigtNoStudstatusCheck, $hasCriticalChangesBis){
+				['meldestichtag_not_exceeded', function ($value) use ($isBerechtigtNoStudstatusCheck) {
 					if ($isBerechtigtNoStudstatusCheck)
-					{
-						return true; // Skip if access right says so*/
-					}
-					if (!$hasCriticalChangesBis) {
-						return true; // Skip if no critical changes were made
-					}
-
+						return true; // Skip if access right says so
 					if (!$value)
 						return true; // Error will be handled by the required statement above
 
@@ -1365,7 +1342,6 @@ class Status extends FHCAPI_Controller
 			'updateamum' => date('c'),
 			'updatevon' => $authUID
 		];
-		$nullableFields = ['statusgrund_id', 'anmerkung', 'rt_stufe'];
 		foreach ([
 					'orgform_kurzbz',
 					'anmerkung',
@@ -1374,17 +1350,8 @@ class Status extends FHCAPI_Controller
 					'rt_stufe',
 					'statusgrund_id'
 				] as $key)
-		{
-			if (in_array($key, $nullableFields))
-			{
-				$updateData[$key] = ($this->input->post($key) === '') ? null : $this->input->post($key);
-			}
-			else if ($this->input->post($key))
-			{
+			if ($this->input->post($key))
 				$updateData[$key] = $this->input->post($key);
-			}
-		}
-
 
 		if ($this->input->post('bestaetigtam')) {
 			$updateData['bestaetigtam'] = $this->input->post('bestaetigtam');

application/controllers/api/frontend/v1/stv/Student.php

@@ -36,8 +36,7 @@ class Student extends FHCAPI_Controller
 		parent::__construct([
 			'get' => ['admin:r', 'assistenz:r'],
 			'save' => ['admin:rw', 'assistenz:rw'],
-			'saveStudent' => ['admin:rw', 'assistenz:rw'],
-			'getPerson' => ['admin:rw', 'assistenz:rw'],
+			'check' => ['admin:rw', 'assistenz:rw'],
 			'add' => ['admin:rw', 'assistenz:rw'] // TODO(chris): extra permissions
 		]);
 
@@ -56,7 +55,7 @@ class Student extends FHCAPI_Controller
 
 		// Load language phrases
 		$this->loadPhrases([
-			'ui', 'lehre', 'person'
+			'ui', 'lehre'
 		]);
 	}
 
@@ -112,28 +111,16 @@ class Student extends FHCAPI_Controller
 		if (defined('ACTIVE_ADDONS') && strpos(ACTIVE_ADDONS, 'bewerbung') !== false) {
 			$this->PrestudentModel->addSelect(
 				"(
-					SELECT kontakt
-					FROM public.tbl_kontakt
-					WHERE kontakttyp='email'
-					AND person_id=p.person_id
-					AND zustellung
-					ORDER BY kontakt_id DESC
+					SELECT kontakt 
+					FROM public.tbl_kontakt 
+					WHERE kontakttyp='email' 
+					AND person_id=p.person_id 
+					AND zustellung 
+					ORDER BY kontakt_id 
 					LIMIT 1
 				) AS email_privat",
 				false
 			);
-			$this->PrestudentModel->addSelect(
-				"(
-					SELECT kontakt
-					FROM public.tbl_kontakt
-					WHERE kontakttyp='email_unverifiziert'
-					AND person_id=p.person_id
-					AND zustellung
-					ORDER BY kontakt_id DESC
-					LIMIT 1
-				) AS email_privat_unverified",
-				false
-			);
 		}
 		$this->PrestudentModel->addSelect(
 			"(
@@ -159,9 +146,9 @@ class Student extends FHCAPI_Controller
 										'LEFT');*/
 
 		$result = $this->PrestudentModel->loadWhere(['tbl_prestudent.prestudent_id' => $prestudent_id]);
-
+		
 		$student = $this->getDataOrTerminateWithError($result);
-
+		
 		if (!$student)
 			return show_404();
 
@@ -221,7 +208,7 @@ class Student extends FHCAPI_Controller
 		]);
 
 		$this->load->library('UDFLib');
-
+		
 		$result = $this->udflib->getCiValidations($this->PersonModel, $this->input->post());
 
 		$udf_field_validations = $this->getDataOrTerminateWithError($result);
@@ -232,7 +219,7 @@ class Student extends FHCAPI_Controller
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 
 		$result = $this->StudentModel->loadWhere(['prestudent_id' => $prestudent_id]);
-
+		
 		$student = $this->getDataOrTerminateWithError($result);
 
 		$uid = $student ? current($student)->student_uid : null;
@@ -245,6 +232,7 @@ class Student extends FHCAPI_Controller
 
 		$person_id = $person ? current($person)->person_id : null;
 
+		
 		$array_allowed_props_lehrverband = ['verband', 'semester', 'gruppe'];
 		$update_lehrverband = array();
 		foreach ($array_allowed_props_lehrverband as $prop) {
@@ -304,7 +292,7 @@ class Student extends FHCAPI_Controller
 		}
 
 		$array_allowed_props_student = ['matrikelnr'];
-		if($this->isLaufendesSemester($studiensemester_kurzbz))
+		if($this->isLaufendesSemester($studiensemester_kurzbz)) 
 		{
 			$array_allowed_props_student = ['matrikelnr', 'verband', 'semester', 'gruppe'];
 		}
@@ -321,10 +309,6 @@ class Student extends FHCAPI_Controller
 		foreach ($array_allowed_props_benutzer as $prop) {
 			$val = $this->input->post($prop);
 			if ($val !== null) {
-				if($prop === 'alias' && $val === '')
-				{
-					$val = null;
-				}
 				$update_benutzer[$prop] = $val;
 			}
 		}
@@ -440,32 +424,7 @@ class Student extends FHCAPI_Controller
 		), ''));
 	}
 
-	/**
-	 * Saves data to a prestudent using their student_uid
-	 *
-	 * @param string			$student_uid
-	 * @param string			$studiensemester_kurzbz
-	 * @return void
-	 */
-	public function saveStudent($student_uid, $studiensemester_kurzbz)
-	{
-		$this->load->model('crm/Student_model', 'StudentModel');
-
-		$result = $this->StudentModel->load([$student_uid]);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		if (!$data)
-			show_404(); // No Student with that ID
-
-		$student = current($data);
-
-		$this->checkPermissionsForPrestudent($student->prestudent_id, ['admin:rw', 'assistenz:rw']);
-
-		return $this->save($student->prestudent_id, $studiensemester_kurzbz);
-	}
-
-	public function getPerson()
+	public function check()
 	{
 		$this->load->library('form_validation');
 
@@ -483,55 +442,21 @@ class Student extends FHCAPI_Controller
 
 		$this->load->model('person/Person_model', 'PersonModel');
 
-		$this->PersonModel->addSelect(
-			'person_id, vorname, nachname, vornamen, wahlname, gebdatum, staatsbuergerschaft, geburtsnation, sprache, anrede,
-			titelpost, titelpre, gebort, gebzeit, homepage, geschlecht, matr_nr,
-			aktiv, unruly, tbl_geschlecht.bezeichnung_mehrsprachig AS geschlecht_bezeichnung'
-		);
-		$this->PersonModel->addJoin('public.tbl_geschlecht', 'geschlecht');
-
 		if ($gebdatum)
 			$this->PersonModel->db->where('gebdatum', (new DateTime($gebdatum))->format('Y-m-d'));
 		if ($vorname && $nachname) {
 			$this->PersonModel->db->or_group_start();
-			$this->PersonModel->db->where('LOWER(nachname)', 'LOWER(' . $this->PersonModel->db->escape(trim($nachname)) . ')', false);
-			$this->PersonModel->db->where('LOWER(vorname)', 'LOWER(' . $this->PersonModel->db->escape(trim($vorname)) . ')', false);
+			$this->PersonModel->db->where('LOWER(nachname)', 'LOWER(' . $this->PersonModel->db->escape($nachname) . ')', false);
+			$this->PersonModel->db->where('LOWER(vorname)', 'LOWER(' . $this->PersonModel->db->escape($vorname) . ')', false);
 			$this->PersonModel->db->group_end();
 		} elseif ($nachname) {
-			$this->PersonModel->db->or_where('LOWER(nachname)', 'LOWER(' . $this->PersonModel->escape(trim($nachname)) . ')', false);
+			$this->PersonModel->db->or_where('LOWER(nachname)', 'LOWER(' . $this->PersonModel->escape($nachname) . ')', false);
 		}
 
 		$result = $this->PersonModel->load();
 
 		$data = $this->getDataOrTerminateWithError($result);
 
-		$this->load->model('person/Adresse_model', 'AdresseModel');
-		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
-
-		foreach ($data as $person)
-		{
-			// get adresses
-			$langIdx = $this->_getLanguageIndex() - 1;
-			$person->geschlecht_bezeichnung = isset($person->geschlecht_bezeichnung[$langIdx]) ? $person->geschlecht_bezeichnung[$langIdx] : '';
-
-			// get Adresse
-			$this->AdresseModel->addOrder('heimatadresse', 'DESC');
-			$this->AdresseModel->addOrder('zustelladresse', 'DESC');
-			$this->AdresseModel->addOrder('adresse_id', 'DESC');
-			$result = $this->AdresseModel->loadWhere(['person_id' => $person->person_id]);
-
-			$adressen = $this->getDataOrTerminateWithError($result);
-
-			$person->adressen = $adressen;
-
-			// get status
-			$result = $this->PrestudentstatusModel->getLastStatusPerson($person->person_id);
-
-			$status = $this->getDataOrTerminateWithError($result);
-
-			$person->status = $status;
-		}
-
 		$this->terminateWithSuccess($data);
 	}
 
@@ -540,57 +465,69 @@ class Student extends FHCAPI_Controller
 		if (!$this->input->post('person_id')) {
 			if (!isset($_POST['address']) || !is_array($_POST['address']))
 				$_POST['address'] = [];
+			$_POST['address']['func'] = 1;
 		}
 		if ($this->input->post('incoming')) {
 			$_POST['ausbildungssemester'] = 0;
 		}
 
-		$this->_validate();
+		$this->load->library('form_validation');
 
-		$this->load->model('crm/Student_model', 'StudentModel');
+		$this->form_validation->set_rules('nachname', 'Nachname', 'callback_requiredIfNotPersonId', [
+			'requiredIfNotPersonId' => $this->p->t('ui', 'error_required')
+		]);
+		$this->form_validation->set_rules('geschlecht', 'Geschlecht', 'callback_requiredIfNotPersonId', [
+			'requiredIfNotPersonId' => $this->p->t('ui', 'error_required')
+		]);
+		$this->form_validation->set_rules('gebdatum', 'Geburtsdatum', 'callback_isValidDate', [
+			'isValidDate' => $this->p->t('ui', 'error_invalid_date')
+		]);
+		$this->form_validation->set_rules('address[func]', 'Address', 'required|integer|less_than[2]|greater_than[-2]');
+		$this->form_validation->set_rules('address[plz]', 'PLZ', 'callback_requiredIfAddressFunc', [
+			'requiredIfAddressFunc' => $this->p->t('ui', 'error_required')
+		]);
+		$this->form_validation->set_rules('address[gemeinde]', 'Gemeinde', 'callback_requiredIfAddressFunc', [
+			'requiredIfAddressFunc' => $this->p->t('ui', 'error_required')
+		]);
+		$this->form_validation->set_rules('address[ort]', 'Ort', 'callback_requiredIfAddressFunc', [
+			'requiredIfAddressFunc' => $this->p->t('ui', 'error_required')
+		]);
+		$this->form_validation->set_rules('address[address]', 'Adresse', 'callback_requiredIfAddressFunc', [
+			'requiredIfAddressFunc' => $this->p->t('ui', 'error_required')
+		]);
+		$this->form_validation->set_rules('email', 'E-Mail', 'valid_email');
+		$this->form_validation->set_rules('studiengang_kz', 'Studiengang', 'required');
+		$this->form_validation->set_rules('studiensemester_kurzbz', 'Studiensemester', 'required');
+		$this->form_validation->set_rules('ausbildungssemester', 'Ausbildungssemester', 'required|integer|less_than[9]|greater_than[-1]');
+		// TODO(chris): validate studienplan with studiengang, semester and orgform?
+		// TODO(chris): validate person_id, studiengang_kz, studiensemester_kurzbz, orgform_kurzbz, nation, gemeinde, ort, geschlecht?
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		// TODO(chris): This should be in a library
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
-		$this->load->model('organisation/Lehrverband_model', 'LehrverbandModel');
-		$this->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
 
-		$this->load->library('PrestudentLib');
+		$this->db->trans_start();
 
-		$errors = [];
-		$person_id = null;
+		$result = $this->addInteressent();
 
-		$this->db->trans_begin();
+		$this->db->trans_complete();
 
-		$result = $this->_addPerson();
-		if (isError($result)) $errors[] = getError($result);
+		if ($this->db->trans_status() === FALSE)
+			$this->terminateWithError('TODO(chris): TEXT', self::ERROR_TYPE_GENERAL);
 
-		if (hasData($result))
-		{
-			$person_id = getData($result);
-			$result = $this->_addAdresse($person_id);
-			if (isError($result)) $errors[] = getError($result);
-			$result = $this->_addKontakt($person_id);
-			if (isError($result)) $errors[] = getError($result);
-			if (!$this->input->post('personOnly')) $result = $this->_addFirstPrestudentstatus($person_id);
-			if (isError($result)) $errors[] = getError($result);
-		}
-
-		if ($this->db->trans_status() === FALSE || !isEmptyArray($errors))
-		{
-			$this->db->trans_rollback();
-			$this->terminateWithError(isEmptyArray($errors) ? $this->p->t('stv', 'error_add_student') : $errors);
-		}
-		$this->db->trans_commit();
-
-		$this->terminateWithSuccess($person_id);
+		$this->terminateWithSuccess($result);
 	}
 
-	private function _addPerson()
+	protected function addInteressent()
 	{
 		// Person anlegen wenn nötig
 		$person_id = $this->input->post('person_id');
 		if (!$person_id) {
 			$this->load->model('person/Person_model', 'PersonModel');
-
+			
 			$data = [
 				'nachname' => $this->input->post('nachname'),
 				'insertamum' => date('c'),
@@ -613,25 +550,19 @@ class Student extends FHCAPI_Controller
 			if ($this->input->post('geschlecht'))
 				$data['geschlecht'] = $this->input->post('geschlecht');
 			if ($this->input->post('gebdatum'))
-				$data['gebdatum'] = (new DateTime($this->input->post('gebdatum')))->format('Y-m-d');
+				$data['gebdatum'] = (new DateTime($this->input->post('datum_obj')))->format('Y-m-d');
 			if ($this->input->post('geburtsnation'))
 				$data['geburtsnation'] = $this->input->post('geburtsnation');
 			if ($this->input->post('staatsbuergerschaft'))
 				$data['staatsbuergerschaft'] = $this->input->post('staatsbuergerschaft');
 
-			return $this->PersonModel->insert($data);
+			$result = $this->PersonModel->insert($data);
+			$person_id = $this->getDataOrTerminateWithError($result);
 		}
 
-		return success($person_id);
-	}
-
-	private function _addAdresse($person_id)
-	{
-		// Addresse anlegen?
-		$anlegen = $this->input->post('address[checked]');
-		if ($anlegen === true)
-		{
-			// Adresse laden
+		// Addresse anlegen
+		$anlegen = $this->input->post('address[func]');
+		if ($anlegen) {
 			$this->load->model('person/Adresse_model', 'AdresseModel');
 
 			$data = [
@@ -643,45 +574,50 @@ class Student extends FHCAPI_Controller
 				'typ' => 'h',
 				'zustelladresse' => true,
 			];
-
-				$this->AdresseModel->addSelect('adresse_id');
+			if ($anlegen < 0) { // Überschreiben
+				$this->AdresseModel->addOrder('zustelladresse', 'DESC');
+				$this->AdresseModel->addOrder('sort');
 				$result = $this->AdresseModel->loadWhere([
 					'person_id' => $person_id
 				]);
+				$address = $this->getDataOrTerminateWithError($result);
+				if ($address) {
+					$address = current($address);
 
-				if (isError($result)) return $result;
-
-				// wenn neue Adresse, heimatadresse setzen
-				if (!hasData($result)) $data['heimatadresse'] = true;
+					$data['updateamum'] = date('c');
+					$data['updatevon'] = getAuthUID();
 
+					$result = $this->AdresseModel->update($address->adresse_id, $data);
+					$this->getDataOrTerminateWithError($result);
+				} else {
+					//Wenn keine Adrese vorhanden ist dann eine neue Anlegen
+					$anlegen = 1;
+					$data['heimatadresse'] = true;
+				}
+			}
+			if ($anlegen > 0) {
 				$data['person_id'] = $person_id;
 				$data['insertamum'] = date('c');
 				$data['insertvon'] = getAuthUID();
-
-				return $this->AdresseModel->insert($data);
+				if (!isset($data['heimatadresse']))
+					$data['heimatadresse'] = !$this->input->post('person_id');
+				
+				$result = $this->AdresseModel->insert($data);
+				$this->getDataOrTerminateWithError($result);
+			}
 		}
-
-		return success(null);
-	}
-
-	private function _addKontakt($person_id)
-	{
+		
 		// Kontaktdaten
 		$kontaktdaten = [];
-
-		foreach (['email', 'telefon', 'mobil'] as $k)
-		{
+		foreach (['email', 'telefon', 'mobil'] as $k) {
 			$v = $this->input->post($k);
 			if ($v)
 				$kontaktdaten[$k] = $v;
 		}
-
-		if (count($kontaktdaten))
-		{
+		if (count($kontaktdaten)) {
 			$this->load->model('person/Kontakt_model', 'KontaktModel');
 
-			foreach ($kontaktdaten as $typ => $kontakt)
-			{
+			foreach ($kontaktdaten as $typ => $kontakt) {
 				$data = [
 					'person_id' => $person_id,
 					'kontakttyp' => $typ,
@@ -691,70 +627,83 @@ class Student extends FHCAPI_Controller
 					'insertvon' => getAuthUID()
 				];
 				$result = $this->KontaktModel->insert($data);
-				if (isError($result)) return $result;
+				$this->getDataOrTerminateWithError($result);
 			}
 		}
-		return success(null);
-	}
 
-	private function _addFirstPrestudentstatus($person_id)
-	{
 		// Prestudent anlegen
-
-		// Anmerkung with Ausbildungsart
-		$studiengang_kz = $this->input->post('studiengang_kz');
-		$studiensemester_kurzbz = $this->input->post('studiensemester_kurzbz');
+		$data = [
+			'aufmerksamdurch_kurzbz' => 'k.A.',
+			'person_id' => $person_id,
+			'studiengang_kz' => $this->input->post('studiengang_kz'),
+			'ausbildungcode' => $this->input->post('letzteausbildung'),
+			'anmerkung' => $this->input->post('anmerkungen'),
+			'reihungstestangetreten' => false,
+			'bismelden' => true
+		];
 		$ausbildungsart = $this->input->post('ausbildungsart');
-		$anmerkung = $this->input->post('anmerkungen');
-		$foerderrelevant = null;
 		if ($ausbildungsart)
-			$anmerkung .= ' Ausbildungsart:' . $ausbildungsart;
-
+			$data['anmerkung'] .= ' Ausbildungsart:' . $ausbildungsart;
 		// Incomings und ausserordentliche sind bei Meldung nicht förderrelevant
 		$incoming = $this->input->post('incoming');
-		if ($incoming || substr($studiengang_kz, 0, 1) == '9')
-			$foerderrelevant = false;
+		if ($incoming || substr($data['studiengang_kz'], 0, 1) == '9')
+			$data['foerderrelevant'] = false;
+		// Wenn die Person schon im System erfasst ist, dann die ZGV des Datensatzes uebernehmen
+		$this->PrestudentModel->addOrder('zgvmas_code');
+		$this->PrestudentModel->addOrder('zgv_code', 'DESC');
+		$this->PrestudentModel->addLimit(1);
+		$result = $this->PrestudentModel->loadWhere([
+			'person_id' => $person_id
+		]);
+		$prestudent = $this->getDataOrTerminateWithError($result);
+		if ($prestudent) {
+			$prestudent = current($prestudent);
+			if ($prestudent->zgv_code) {
+				$data['zgv_code'] = $prestudent->zgv_code;
+				$data['zgvort'] = $prestudent->zgvort;
+				$data['zgvdatum'] = $prestudent->zgvdatum;
 
+				$data['zgvmas_code'] = $prestudent->zgvmas_code;
+				$data['zgvmaort'] = $prestudent->zgvmaort;
+				$data['zgvmadatum'] = $prestudent->zgvmadatum;
+			}
+		}
 		// Prestudent speichern
-		$result = $this->prestudentlib->setPrestudent(
-			$person_id,
-			$studiengang_kz,
-			$this->input->post('letzteausbildung'),
-			$anmerkung,
-			$foerderrelevant
-		);
-		if (isError($result)) return $result;
-		if (!hasData($result)) return error('Error when adding prestudent');
+		$result = $this->PrestudentModel->insert($data);
+		$prestudent_id = $this->getDataOrTerminateWithError($result);
 
-		$prestudent_id = getData($result);
+		// Prestudent Rolle Anlegen
+		$data = [
+			'prestudent_id' => $prestudent_id,
+			'status_kurzbz' => $incoming ? 'Incoming' : 'Interessent',
+			'studiensemester_kurzbz' => $this->input->post('studiensemester_kurzbz'),
+			'ausbildungssemester' => $this->input->post('ausbildungssemester') ?: 0,
+			'orgform_kurzbz' => $this->input->post('orgform_kurzbz') ?: null,
+			'studienplan_id' => $this->input->post('studienplan_id') ?: null,
+			'datum' => date('Y-m-d'),
+			'insertamum' => date('c'),
+			'insertvon' => getAuthUID()
+		];
+		$result = $this->PrestudentstatusModel->insert($data);
+		$this->getDataOrTerminateWithError($result);
 
-		// wenn Incoming, Incoming Daten hinzufügen
-		if ($incoming)
-		{
-			$statusResult = $this->prestudentlib->setFirstIncoming(
-				$prestudent_id,
-				$studiengang_kz,
-				$studiensemester_kurzbz,
-				$this->input->post('orgform_kurzbz'),
-				$this->input->post('studienplan_id')
-			);
+		if ($incoming) {
+			// TODO(chris): IMPLEMENT!
+			//Matrikelnummer und UID generieren
+			//Benutzerdatensatz anlegen
+			//Studentendatensatz anlegen
+			//StudentLehrverband anlegen
 		}
-		else
-		{
-			// Prestudent Rolle Anlegen
-			$statusResult = $this->prestudentlib->setFirstStatus(
-				$prestudent_id,
-				$this->PrestudentstatusModel::STATUS_INTERESSENT,
-				$studiensemester_kurzbz,
-				$this->input->post('ausbildungssemester'),
-				$this->input->post('orgform_kurzbz'),
-				$this->input->post('studienplan_id')
-			);
-		}
-		if (!hasData($statusResult)) return error('error when adding status');
-		if (isError($statusResult)) return $statusResult;
 
-		return success($prestudent_id);
+		// TODO(chris): DEBUG
+		/*$result = $this->PrestudentModel->loadWhere([
+			'pestudent_id' => 1
+		]);
+		if (isError($result)) {
+			return $result;
+		}*/
+
+		return success(true);
 	}
 
 	public function requiredIfNotPersonId($value)
@@ -766,84 +715,13 @@ class Student extends FHCAPI_Controller
 	
 	public function requiredIfAddressFunc($value)
 	{
-		if (!isset($_POST['address']['checked']) || !$_POST['address']['checked'])
+		if (!$_POST['address']['func'])
 			return true;
 		return !!$value;
 	}
 
-	public function requiredIfStudentFunc($value)
+	public function isValidDate($value)
 	{
-		if (isset($_POST['personOnly']) && $_POST['personOnly'])
-			return true;
-		return !!$value;
-	}
-
-	public function requiredIfStudentAndNotIncomingFunc($value)
-	{
-		if ((isset($_POST['incoming']) && $_POST['incoming']) || $this->requiredIfStudentFunc($value))
-			return true;
-		return !!$value;
-	}
-
-	/**
-	 * Validates input data. Terminates with validation errors, if invalid.
-	 */
-	private function _validate()
-	{
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules('nachname', 'Nachname', 'callback_requiredIfNotPersonId', [
-			'requiredIfNotPersonId' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('person', 'nachname')])
-		]);
-		$this->form_validation->set_rules('geschlecht', 'Geschlecht', 'callback_requiredIfNotPersonId', [
-			'requiredIfNotPersonId' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('person', 'geschlecht')])
-		]);
-		$this->form_validation->set_rules('gebdatum', 'Geburtsdatum', ['isValidDate', function($value) { return isValidDate($value); }], [
-			'isValidDate' => $this->p->t('ui', 'error_invalid_date')
-		]);
-		//$this->form_validation->set_rules('address[checked]', 'Address', 'required');
-		$this->form_validation->set_rules('address[plz]', 'PLZ', 'callback_requiredIfAddressFunc', [
-			'requiredIfAddressFunc' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('person', 'plz')])
-		]);
-		$this->form_validation->set_rules('address[gemeinde]', 'Gemeinde', 'callback_requiredIfAddressFunc', [
-			'requiredIfAddressFunc' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('person', 'gemeinde')])
-		]);
-		$this->form_validation->set_rules('address[ort]', 'Ort', 'callback_requiredIfAddressFunc', [
-			'requiredIfAddressFunc' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('person', 'ort')])
-		]);
-		$this->form_validation->set_rules('address[address]', 'Adresse', 'callback_requiredIfAddressFunc', [
-			'requiredIfAddressFunc' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('person', 'adresse')])
-		]);
-		$this->form_validation->set_rules('email', 'E-Mail', 'valid_email');
-		$this->form_validation->set_rules('studiengang_kz', 'Studiengang', 'callback_requiredIfStudentFunc', [
-			'requiredIfStudentFunc' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('lehre', 'studiengang')])
-		]);
-		$this->form_validation->set_rules('studiensemester_kurzbz', 'Studiensemester', 'callback_requiredIfStudentFunc', [
-			'requiredIfStudentFunc' => $this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('lehre', 'studiensemester')])
-		]);
-		$this->form_validation->set_rules(
-			'ausbildungssemester',
-			'Ausbildungssemester',
-			'callback_requiredIfStudentAndNotIncomingFunc|integer|less_than[9]|greater_than[-1]',
-			[
-				'requiredIfStudentAndNotIncomingFunc' =>
-					$this->p->t('ui', 'error_fieldRequired', ['field' => $this->p->t('lehre', 'ausbildungssemester')]),
-			]
-		);
-		// TODO(chris): validate studienplan with studiengang, semester and orgform?
-		// TODO(chris): validate person_id, studiengang_kz, studiensemester_kurzbz, orgform_kurzbz, nation, gemeinde, ort, geschlecht?
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-	}
-
-	private function _getLanguageIndex()
-	{
-		$this->load->model('system/Sprache_model', 'SpracheModel');
-		$this->SpracheModel->addSelect('index');
-		$result = $this->SpracheModel->loadWhere(array('sprache' => getUserLanguage()));
-		$this->addMeta('lang', getUserLanguage());
-
-		return hasData($result) ? getData($result)[0]->index : 1;
+		return isValidDate($value);
 	}
 }

application/controllers/api/frontend/v1/stv/Students.php

@@ -44,12 +44,14 @@ class Students extends FHCAPI_Controller
 		}
 
 		// Load Libraries
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
 		$this->load->library('PhrasesLib');
 		$this->loadPhrases(
 			array(
 				'lehre'
 			)
 		);
+
 	}
 
 	/**
@@ -73,7 +75,7 @@ class Students extends FHCAPI_Controller
 	 * /(studiengang_kz)/(orgform)/prestudent/(studiensemester_kurzbz)/(filter)					=> getPrestudentsOrgform
 	 * /(studiengang_kz)/(orgform)/prestudent/(studiensemester_kurzbz)/(filter)/(otherfilter)	=> getPrestudentsOrgform
 	 *
-	 * /(studiensemester_kurzbz)/(studiengang_kz)/(semester)/grp/(gruppe)	=> getStudentsSpezialgruppe
+	 * /(studiensemester_kurzbz)/(studiengang_kz)/(semester)/grp/(gruppe)	=> getStudentsSpezialguppe
 	 *
 	 * /(studiensemester_kurzbz)/(studiengang_kz)								=> getStudents
 	 * /(studiensemester_kurzbz)/(studiengang_kz)/(semester)					=> getStudents
@@ -99,183 +101,39 @@ class Students extends FHCAPI_Controller
 	}
 
 	/**
-	 * @param string		$studiensemester_kurzbz
-	 *
 	 * @return void
 	 */
-	public function getIncoming($studiensemester_kurzbz)
+	public function getIncoming()
 	{
 		$this->addMeta('ci_method', __FUNCTION__);
-		$this->addMeta('ci_params', [
-			'studiensemester_kurzbz' => $studiensemester_kurzbz
-		]);
-		
-
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-
-
-		$this->PrestudentModel->addJoin(
-			"(
-				SELECT prestudent_id 
-				FROM public.tbl_prestudentstatus
-				WHERE status_kurzbz = 'Incoming'
-				AND studiensemester_kurzbz = " . $this->PrestudentModel->escape($studiensemester_kurzbz) . "
-			) test",
-			"prestudent_id"
-		);
-
-
-		$this->prepareQuery($studiensemester_kurzbz);
-
-		$this->PrestudentModel->addSelect("COALESCE(
-			v.semester::text, 
-			CASE 
-				WHEN pls.status_kurzbz IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') 
-				THEN pls.ausbildungssemester::text 
-				ELSE ''::text 
-			END
-		) AS semester", false);
-		$this->PrestudentModel->addSelect("COALESCE(v.verband::text, ''::text)");
-		$this->PrestudentModel->addSelect("COALESCE(v.gruppe::text, ''::text)");
-		
-		$this->addSelectPrioRel();
-
-		$this->addFilter($studiensemester_kurzbz);
-
-
-		$result = $this->PrestudentModel->load();
-		
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
+		// TODO(chris): IMPLEMENT!
+		$this->terminateWithSuccess([]);
 	}
 
 	/**
-	 * @param string		$studiensemester_kurzbz
-	 *
 	 * @return void
 	 */
-	public function getOutgoing($studiensemester_kurzbz)
+	public function getOutgoing()
 	{
 		$this->addMeta('ci_method', __FUNCTION__);
-		$this->addMeta('ci_params', [
-			'studiensemester_kurzbz' => $studiensemester_kurzbz
-		]);
-		
-
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-
-
-		$this->PrestudentModel->addJoin(
-			"(
-				SELECT prestudent_id 
-				FROM bis.tbl_bisio bis 
-				JOIN public.tbl_student USING (student_uid)
-				JOIN public.tbl_studiensemester stdsem ON (
-					(bis.von >= stdsem.start AND bis.von <= stdsem.ende) 
-					OR 
-					(bis.bis >= stdsem.start AND bis.bis <= stdsem.ende) 
-					OR 
-					(bis.von <= stdsem.start AND bis.bis >= stdsem.ende)
-				)
-				WHERE NOT EXISTS (
-					SELECT 1 
-					FROM public.tbl_prestudentstatus 
-					WHERE status_kurzbz = 'Incoming'
-					AND prestudent_id = tbl_student.prestudent_id
-				) AND stdsem.studiensemester_kurzbz = " . $this->PrestudentModel->escape($studiensemester_kurzbz) . "
-				GROUP BY prestudent_id
-			) test",
-			"prestudent_id"
-		);
-
-
-		$this->prepareQuery($studiensemester_kurzbz);
-
-
-		$this->PrestudentModel->addSelect("COALESCE(
-			v.semester::text, 
-			CASE 
-				WHEN pls.status_kurzbz IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') 
-				THEN pls.ausbildungssemester::text 
-				ELSE ''::text 
-			END
-		) AS semester", false);
-		$this->PrestudentModel->addSelect("COALESCE(v.verband::text, ''::text)");
-		$this->PrestudentModel->addSelect("COALESCE(v.gruppe::text, ''::text)");
-		
-		$this->addSelectPrioRel();
-
-		$this->addFilter($studiensemester_kurzbz);
-
-
-		$result = $this->PrestudentModel->load();
-		
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
+		// TODO(chris): IMPLEMENT!
+		$this->terminateWithSuccess([]);
 	}
 
 	/**
-	 * @param string		$studiensemester_kurzbz
-	 *
 	 * @return void
 	 */
-	public function getGemeinsamestudien($studiensemester_kurzbz)
+	public function getGemeinsamestudien()
 	{
 		$this->addMeta('ci_method', __FUNCTION__);
-		$this->addMeta('ci_params', [
-			'studiensemester_kurzbz' => $studiensemester_kurzbz
-		]);
-		
-
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-
-
-		$this->PrestudentModel->addJoin(
-			"(
-				SELECT prestudent_id
-				FROM bis.tbl_mobilitaet 
-				WHERE studiensemester_kurzbz = " . $this->PrestudentModel->escape($studiensemester_kurzbz) . "
-			) bis",
-			"prestudent_id"
-		);
-
-
-		$this->prepareQuery($studiensemester_kurzbz);
-
-
-		$this->PrestudentModel->addSelect("COALESCE(
-			v.semester::text, 
-			CASE 
-				WHEN pls.status_kurzbz IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') 
-				THEN pls.ausbildungssemester::text 
-				ELSE ''::text 
-			END
-		) AS semester", false);
-		$this->PrestudentModel->addSelect("COALESCE(v.verband::text, ''::text)");
-		$this->PrestudentModel->addSelect("COALESCE(v.gruppe::text, ''::text)");
-		
-		$this->addSelectPrioRel();
-
-		$this->addFilter($studiensemester_kurzbz);
-
-
-		$result = $this->PrestudentModel->load();
-		
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
+		// TODO(chris): IMPLEMENT!
+		$this->terminateWithSuccess([]);
 	}
 
-	public function getPrestudents(
-		$studiengang_kz,
-		$studiensemester_kurzbz = null,
-		$filter = null
-	) {
+	public function getPrestudents($studiengang_kz,
+		$studiensemester_kurzbz = null, $filter = null
+	)
+	{
 		$this->addMeta('ci_method', __FUNCTION__);
 		$this->addMeta('ci_params', array(
 			'studiengang_kz' => $studiengang_kz,
@@ -286,12 +144,10 @@ class Students extends FHCAPI_Controller
 		$this->fetchPrestudents($studiengang_kz, $studiensemester_kurzbz, $filter);
 	}
 
-	public function getPrestudentsOrgform(
-		$studiengang_kz,
-		$orgform_kurzbz,
-		$studiensemester_kurzbz = null,
-		$filter = null
-	) {
+	public function getPrestudentsOrgform($studiengang_kz, $orgform_kurzbz,
+		$studiensemester_kurzbz = null, $filter = null
+	)
+	{
 		$this->addMeta('ci_method', __FUNCTION__);
 		$this->addMeta('ci_params', array(
 			'studiengang_kz' => $studiengang_kz,
@@ -371,7 +227,7 @@ class Students extends FHCAPI_Controller
 
 				$stg = $this->getDataOrTerminateWithError($result);
 				if (!$stg)
-					$this->terminateWithSuccess([]);
+					$this->terminateWithValidationErrors(['' => 'Studiengang does not exist']); // TODO(chris): phrase
 				$stg = current($stg);
 
 				$where['ps.status_kurzbz'] = 'Interessent';
@@ -440,10 +296,7 @@ class Students extends FHCAPI_Controller
 				break;
 			default:
 				if (!$studiensemester_kurzbz) {
-					/** NOTE(chris):
-					 * show all prestudents in this stg who don't have a status
-					 * $orgform_kurzbz does not change the results since orgform is stored in the status table
-					 */
+					// TODO(chris): this does not work with $orgform_kurzbz != null
 					$where['ps.status_kurzbz'] = null;
 				} else {
 					$this->PrestudentModel->db->where_in('ps.status_kurzbz', [
@@ -457,18 +310,42 @@ class Students extends FHCAPI_Controller
 				break;
 		}
 
+		/*
+			$this->PrestudentModel->addJoin('public.tbl_studiengang stg', 'studiengang_kz', 'LEFT');
+			$this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
+			$this->PrestudentModel->addJoin('public.tbl_prestudentstatus pls', '
+				pls.status_kurzbz=public.get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) 
+				AND pls.prestudent_id=tbl_prestudent.prestudent_id 
+				AND pls.studiensemester_kurzbz=public.get_stdsem_prestudent(tbl_prestudent.prestudent_id, NULL) 
+				AND pls.ausbildungssemester=public.get_absem_prestudent(tbl_prestudent.prestudent_id, NULL)', 'LEFT');
+			$this->PrestudentModel->addJoin('lehre.tbl_studienplan sp', 'studienplan_id', 'LEFT');
+			$this->PrestudentModel->addJoin('public.tbl_prestudentstatus ps', '
+				ps.status_kurzbz=public.get_rolle_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ') 
+				AND ps.prestudent_id=tbl_prestudent.prestudent_id 
+				AND ps.studiensemester_kurzbz=public.get_stdsem_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ') 
+				AND ps.ausbildungssemester=public.get_absem_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ')', 'LEFT');*/
 		$this->prepareQuery($studiensemester_kurzbz);
 		
 		$this->PrestudentModel->addSelect("
-			CASE 
-				WHEN pls.status_kurzbz IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') 
-				THEN ps.ausbildungssemester::text 
-				ELSE ''::text 
-			END AS semester", false);
+			CASE WHEN ps.status_kurzbz IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') 
+			THEN ps.ausbildungssemester::text 
+			ELSE ''::text END AS semester", false);
 		$this->PrestudentModel->addSelect("'' AS verband");
 		$this->PrestudentModel->addSelect("'' AS gruppe");
 		$this->addSelectPrioRel();
 
+		//add status per semester
+		$this->PrestudentModel->addSelect(
+			"(
+				SELECT status_kurzbz
+				FROM public.tbl_prestudentstatus pss
+				WHERE pss.prestudent_id = public.tbl_prestudent.prestudent_id
+				  AND pss.studiensemester_kurzbz = " . $this->PrestudentModel->escape($studiensemester_kurzbz) . "
+				ORDER BY GREATEST(pss.datum, '0001-01-01') DESC
+				LIMIT 1
+				) AS statusofsemester"
+		);
+
 		$this->addFilter($studiensemester_kurzbz);
 
 		$result = $this->PrestudentModel->loadWhere($where);
@@ -478,13 +355,10 @@ class Students extends FHCAPI_Controller
 		$this->terminateWithSuccess($data);
 	}
 
-	public function getStudents(
-		$studiensemester_kurzbz,
-		$studiengang_kz,
-		$semester = null,
-		$verband = null,
-		$gruppe = null
-	) {
+	public function getStudents($studiensemester_kurzbz,
+		$studiengang_kz, $semester = null, $verband = null, $gruppe = null
+	)
+	{
 		$this->addMeta('ci_method', __FUNCTION__);
 		$this->addMeta('ci_params', array(
 			'studiensemester_kurzbz' => $studiensemester_kurzbz,
@@ -497,14 +371,10 @@ class Students extends FHCAPI_Controller
 		$this->fetchStudents($studiensemester_kurzbz, $studiengang_kz, $semester, $verband, $gruppe, null, null);
 	}
 
-	public function getStudentsOrgform(
-		$studiensemester_kurzbz,
-		$studiengang_kz,
-		$orgform_kurzbz,
-		$semester = null,
-		$verband = null,
-		$gruppe = null
-	) {
+	public function getStudentsOrgform($studiensemester_kurzbz,
+		$studiengang_kz, $orgform_kurzbz, $semester = null, $verband = null, $gruppe = null
+	)
+	{
 		$this->addMeta('ci_method', __FUNCTION__);
 		$this->addMeta('ci_params', array(
 			'studiensemester_kurzbz' => $studiensemester_kurzbz,
@@ -518,12 +388,10 @@ class Students extends FHCAPI_Controller
 		$this->fetchStudents($studiensemester_kurzbz, $studiengang_kz, $semester, $verband, $gruppe, null, $orgform_kurzbz);
 	}
 
-	public function getStudentsSpezialgruppe(
-		$studiensemester_kurzbz,
-		$studiengang_kz,
-		$semester,
-		$gruppe_kurzbz
-	) {
+	public function getStudentsSpezialgruppe($studiensemester_kurzbz,
+		$studiengang_kz, $semester, $gruppe_kurzbz,
+		$orgform_kurzbz = null)
+	{
 		$this->addMeta('ci_method', __FUNCTION__);
 		$this->addMeta('ci_params', array(
 			'studiensemester_kurzbz' => $studiensemester_kurzbz,
@@ -535,13 +403,10 @@ class Students extends FHCAPI_Controller
 		$this->fetchStudents($studiensemester_kurzbz, $studiengang_kz, $semester, null, null, $gruppe_kurzbz, null);
 	}
 
-	public function getStudentsOrgformSpezialgruppe(
-		$studiensemester_kurzbz,
-		$orgform_kurzbz,
-		$studiengang_kz,
-		$semester,
-		$gruppe_kurzbz
-	) {
+	public function getStudentsOrgformSpezialgruppe($studiensemester_kurzbz,
+		$orgform_kurzbz, $studiengang_kz, $semester, $gruppe_kurzbz
+	)
+	{
 		$this->addMeta('ci_method', __FUNCTION__);
 		$this->addMeta('ci_params', array(
 			'studiensemester_kurzbz' => $studiensemester_kurzbz,
@@ -565,15 +430,8 @@ class Students extends FHCAPI_Controller
 	 *
 	 * @return void
 	 */
-	protected function fetchStudents(
-		$studiensemester_kurzbz,
-		$studiengang_kz,
-		$semester = null,
-		$verband = null,
-		$gruppe = null,
-		$gruppe_kurzbz = null,
-		$orgform_kurzbz = null
-	) {
+	protected function fetchStudents($studiensemester_kurzbz, $studiengang_kz, $semester = null, $verband = null, $gruppe = null, $gruppe_kurzbz = null, $orgform_kurzbz = null)
+	{
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
 
@@ -582,6 +440,21 @@ class Students extends FHCAPI_Controller
 			$this->terminateWithError($studiensemester_kurzbz . ' - ' . $this->p->t('lehre', 'error_noStudiensemester'));
 		}
 
+		/*
+			$this->PrestudentModel->addJoin('public.tbl_studiengang stg', 'studiengang_kz', 'LEFT');
+			$this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
+			$this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id');
+			$this->PrestudentModel->addJoin('public.tbl_prestudentstatus pls', '
+				pls.status_kurzbz=public.get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) 
+				AND pls.prestudent_id=tbl_prestudent.prestudent_id 
+				AND pls.studiensemester_kurzbz=public.get_stdsem_prestudent(tbl_prestudent.prestudent_id, NULL) 
+				AND pls.ausbildungssemester=public.get_absem_prestudent(tbl_prestudent.prestudent_id, NULL)', 'LEFT');
+			$this->PrestudentModel->addJoin('lehre.tbl_studienplan sp', 'studienplan_id', 'LEFT');
+			$this->PrestudentModel->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid');
+			$this->PrestudentModel->addJoin(
+				'public.tbl_studentlehrverband v',
+				'v.student_uid=s.student_uid AND v.studiensemester_kurzbz=' . $this->PrestudentModel->escape($studiensemester_kurzbz)
+			);*/
 		$this->prepareQuery($studiensemester_kurzbz, '');
 
 		$this->PrestudentModel->addSelect('v.semester');
@@ -589,6 +462,18 @@ class Students extends FHCAPI_Controller
 		$this->PrestudentModel->addSelect('v.gruppe');
 		$this->PrestudentModel->addSelect("'' AS priorisierung_relativ");
 
+		//add status per semester
+		$this->PrestudentModel->addSelect(
+			"(
+				SELECT status_kurzbz
+				FROM public.tbl_prestudentstatus pss
+				WHERE pss.prestudent_id = public.tbl_prestudent.prestudent_id
+				  AND pss.studiensemester_kurzbz = " . $this->PrestudentModel->escape($studiensemester_kurzbz) . "
+				ORDER BY GREATEST(pss.datum, '0001-01-01') DESC
+				LIMIT 1
+				) AS statusofsemester"
+		);
+
 
 		$where = [];
 
@@ -621,6 +506,7 @@ class Students extends FHCAPI_Controller
 					false
 				);
 			}
+
 		}
 
 		$this->addFilter($studiensemester_kurzbz);
@@ -654,18 +540,39 @@ class Students extends FHCAPI_Controller
 
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 
+		/*
+			$this->PrestudentModel->addJoin('public.tbl_studiengang stg', 'studiengang_kz', 'LEFT');
+			$this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
+			$this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id', 'LEFT');
+			$this->PrestudentModel->addJoin('public.tbl_prestudentstatus pls', '
+				pls.status_kurzbz=public.get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) 
+				AND pls.prestudent_id=tbl_prestudent.prestudent_id 
+				AND pls.studiensemester_kurzbz=public.get_stdsem_prestudent(tbl_prestudent.prestudent_id, NULL) 
+				AND pls.ausbildungssemester=public.get_absem_prestudent(tbl_prestudent.prestudent_id, NULL)', 'LEFT');
+			$this->PrestudentModel->addJoin('lehre.tbl_studienplan sp', 'studienplan_id', 'LEFT');
+			$this->PrestudentModel->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid', 'LEFT');
+			$this->PrestudentModel->addJoin(
+				'public.tbl_studentlehrverband v',
+				'v.student_uid=s.student_uid AND v.studiensemester_kurzbz=' . $this->PrestudentModel->escape($studiensemester_kurzbz),
+				'LEFT'
+			);*/
 		$this->prepareQuery($studiensemester_kurzbz);
 
-		$this->PrestudentModel->addSelect("COALESCE(
-			v.semester::text, 
-			CASE 
-				WHEN pls.status_kurzbz IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') 
-				THEN pls.ausbildungssemester::text 
-				ELSE ''::text 
-			END
-		) AS semester", false);
-		$this->PrestudentModel->addSelect("COALESCE(v.verband::text, ''::text)");
-		$this->PrestudentModel->addSelect("COALESCE(v.gruppe::text, ''::text)");
+		$this->PrestudentModel->addSelect("COALESCE(v.semester::text, CASE WHEN public.get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') THEN public.get_absem_prestudent(tbl_prestudent.prestudent_id, NULL)::text ELSE ''::text END) AS semester", false);
+		$this->PrestudentModel->addSelect('v.verband');
+		$this->PrestudentModel->addSelect('v.gruppe');
+
+		//add status per semester
+		$this->PrestudentModel->addSelect(
+			"(
+				SELECT status_kurzbz
+				FROM public.tbl_prestudentstatus pss
+				WHERE pss.prestudent_id = public.tbl_prestudent.prestudent_id
+				  AND pss.studiensemester_kurzbz = " . $this->PrestudentModel->escape($studiensemester_kurzbz) . "
+				ORDER BY GREATEST(pss.datum, '0001-01-01') DESC
+				LIMIT 1
+				) AS statusofsemester"
+		);
 
 		$this->addSelectPrioRel();
 
@@ -702,12 +609,40 @@ class Students extends FHCAPI_Controller
 
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 
+		/*
+			$this->PrestudentModel->addJoin('public.tbl_studiengang stg', 'studiengang_kz', 'LEFT');
+			$this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
+			$this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id');
+			$this->PrestudentModel->addJoin('public.tbl_prestudentstatus pls', '
+				pls.status_kurzbz=public.get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) 
+				AND pls.prestudent_id=tbl_prestudent.prestudent_id 
+				AND pls.studiensemester_kurzbz=public.get_stdsem_prestudent(tbl_prestudent.prestudent_id, NULL) 
+				AND pls.ausbildungssemester=public.get_absem_prestudent(tbl_prestudent.prestudent_id, NULL)', 'LEFT');
+			$this->PrestudentModel->addJoin('lehre.tbl_studienplan sp', 'studienplan_id', 'LEFT');
+			$this->PrestudentModel->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid');
+			$this->PrestudentModel->addJoin(
+				'public.tbl_studentlehrverband v',
+				'v.student_uid=s.student_uid AND v.studiensemester_kurzbz=' . $this->PrestudentModel->escape($studiensemester_kurzbz),
+				'LEFT'
+			);*/
 		$this->prepareQuery($studiensemester_kurzbz);
 
 		$this->PrestudentModel->addSelect('v.semester');
 		$this->PrestudentModel->addSelect('v.verband');
 		$this->PrestudentModel->addSelect('v.gruppe');
 
+		//add status per semester
+		$this->PrestudentModel->addSelect(
+			"(
+				SELECT status_kurzbz
+				FROM public.tbl_prestudentstatus pss
+				WHERE pss.prestudent_id = public.tbl_prestudent.prestudent_id
+				  AND pss.studiensemester_kurzbz = " . $this->PrestudentModel->escape($studiensemester_kurzbz) . "
+				ORDER BY GREATEST(pss.datum, '0001-01-01') DESC
+				LIMIT 1
+				) AS statusofsemester"
+		);
+
 		$this->addSelectPrioRel();
 
 
@@ -746,59 +681,21 @@ class Students extends FHCAPI_Controller
 
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 
+		/*
+			$this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
+			$this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id');
+			$this->PrestudentModel->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid');
+			$this->PrestudentModel->addJoin(
+				'public.tbl_studentlehrverband v',
+				'v.student_uid=s.student_uid AND v.studiensemester_kurzbz=' . $this->PrestudentModel->escape($studiensemester_kurzbz),
+				'LEFT'
+			);*/
 		$this->prepareQuery($studiensemester_kurzbz);
 
 		$this->PrestudentModel->addSelect('v.semester');
 		$this->PrestudentModel->addSelect('v.verband');
 		$this->PrestudentModel->addSelect('v.gruppe');
 
-		$this->addSelectPrioRel();
-
-		$this->addFilter($studiensemester_kurzbz);
-
-		$result = $this->PrestudentModel->loadWhere([
-			'p.person_id' => $person_id
-		]);
-		
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
-
-	/**
-	 * @param string		$studiensemester_kurzbz
-	 *
-	 * @return void
-	 */
-	public function search($studiensemester_kurzbz)
-	{
-		$this->addMeta('ci_method', __FUNCTION__);
-		$this->addMeta('ci_params', array(
-			'studiensemester_kurzbz' => $studiensemester_kurzbz
-		));
-
-		$this->load->library('SearchLib', [ 'config' => 'searchstv' ]);
-		$this->load->library('form_validation');
-
-		$this->form_validation->set_rules('searchstr', 'searchstr', 'required');
-		$this->form_validation->set_rules('types[]', 'types', 'required');
-
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-
-		$result = $this->searchlib->search($this->input->post('searchstr'), $this->input->post('types'));
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-
-		$this->prepareQuery($studiensemester_kurzbz);
-
-		$this->PrestudentModel->addSelect("COALESCE(v.semester::text, CASE WHEN public.get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) IN ('Aufgenommener', 'Bewerber', 'Wartender', 'interessent') THEN public.get_absem_prestudent(tbl_prestudent.prestudent_id, NULL)::text ELSE ''::text END) AS semester", false);
-		$this->PrestudentModel->addSelect('v.verband');
-		$this->PrestudentModel->addSelect('v.gruppe');
-
 		//add status per semester
 		$this->PrestudentModel->addSelect(
 			"(
@@ -815,31 +712,10 @@ class Students extends FHCAPI_Controller
 
 		$this->addFilter($studiensemester_kurzbz);
 
-		$prestudent_ids = [];
-		$student_uids = [];
-			$this->addMeta('data', $data);
-		foreach ($data as $row) {
-			$dataset = json_decode($row->data);
-			if ($row->type == 'prestudent') {
-				$prestudent_ids[] = $dataset->prestudent_id;
-			} elseif ($row->type == 'student') {
-				$student_uids[] = $dataset->uid;
-			}
-		}
-
-		if ($prestudent_ids && $student_uids) {
-			$this->PrestudentModel->db->where_in('tbl_prestudent.prestudent_id', $prestudent_ids);
-			$this->PrestudentModel->db->or_where_in('s.student_uid', $student_uids);
-		} elseif ($prestudent_ids) {
-			$this->PrestudentModel->db->where_in('tbl_prestudent.prestudent_id', $prestudent_ids);
-		} elseif ($student_uids) {
-			$this->PrestudentModel->db->where_in('s.student_uid', $student_uids);
-		} else {
-			$this->terminateWithSuccess([]);
-		}
-
-		$result = $this->PrestudentModel->load();
-
+		$result = $this->PrestudentModel->loadWhere([
+			'p.person_id' => $person_id
+		]);
+		
 		$data = $this->getDataOrTerminateWithError($result);
 
 		$this->terminateWithSuccess($data);
@@ -895,18 +771,6 @@ class Students extends FHCAPI_Controller
 		// verband
 		// gruppe
 
-		//add status per semester
-		$this->PrestudentModel->addSelect(
-			"(
-				SELECT status_kurzbz
-				FROM public.tbl_prestudentstatus pss
-				WHERE pss.prestudent_id = public.tbl_prestudent.prestudent_id
-				  AND pss.studiensemester_kurzbz = " . $this->PrestudentModel->escape($studiensemester_kurzbz) . "
-				ORDER BY GREATEST(pss.datum, '0001-01-01') DESC
-				LIMIT 1
-				) AS statusofsemester"
-		);
-
 		$this->PrestudentModel->addSelect('UPPER(stg.typ || stg.kurzbz) AS studiengang');
 		$this->PrestudentModel->addSelect('tbl_prestudent.studiengang_kz');
 		$this->PrestudentModel->addSelect('stg.bezeichnung AS stg_bezeichnung');
@@ -942,6 +806,13 @@ class Students extends FHCAPI_Controller
 		$this->PrestudentModel->addSelect('mentor');
 		$this->PrestudentModel->addSelect('b.aktiv AS bnaktiv');
 
+		/*$this->PrestudentModel->addSelect('tbl_prestudent.reihungstest_id');
+		$this->PrestudentModel->addSelect('tbl_prestudent.anmeldungreihungstest');
+		$this->PrestudentModel->addSelect('tbl_prestudent.gsstudientyp_kurzbz');
+		$this->PrestudentModel->addSelect('tbl_prestudent.priorisierung');
+		$this->PrestudentModel->addSelect('p.zugangscode');
+		$this->PrestudentModel->addSelect('p.bpk');*/
+
 		$this->PrestudentModel->db->where_in('tbl_prestudent.studiengang_kz', $this->allowedStgs);
 
 		$this->PrestudentModel->addOrder('nachname');
@@ -956,13 +827,13 @@ class Students extends FHCAPI_Controller
 		$this->PrestudentModel->addSelect("(
 			SELECT count(*)
 			FROM (
-				SELECT *, public.get_rolle_prestudent(pss.prestudent_id, NULL) AS laststatus
-				FROM public.tbl_prestudent pss
-				JOIN public.tbl_prestudentstatus USING (prestudent_id)
+				SELECT *, public.get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) AS laststatus
+				FROM PUBLIC.tbl_prestudent pss
+				JOIN PUBLIC.tbl_prestudentstatus USING (prestudent_id)
 				WHERE person_id = p.person_id
 				AND studiensemester_kurzbz = (
 					SELECT studiensemester_kurzbz
-					FROM public.tbl_prestudentstatus
+					FROM PUBLIC.tbl_prestudentstatus
 					WHERE prestudent_id = tbl_prestudent.prestudent_id
 					AND status_kurzbz = 'Interessent'
 					LIMIT 1
@@ -971,7 +842,7 @@ class Students extends FHCAPI_Controller
 			) prest
 			WHERE laststatus NOT IN ('Abbrecher', 'Abgewiesener', 'Absolvent')
 			AND priorisierung <= tbl_prestudent.priorisierung
-		) || ' (' || COALESCE(tbl_prestudent.priorisierung::text, ' '::text) || ')' AS priorisierung_relativ", false);
+		) || ' (' || tbl_prestudent.priorisierung || ')' AS priorisierung_relativ", false);
 	}
 
 	/**
@@ -983,20 +854,40 @@ class Students extends FHCAPI_Controller
 	 */
 	protected function addFilter($studiensemester_kurzbz)
 	{
-		$filter = $this->input->post('filter');
-		
+		$filter = json_decode($this->input->get('filter'), true);
 		if (!is_array($filter))
 		{
-			$this->addMeta('addfilter', 'invalid filter: ' . json_encode($this->input->post('filter')));
+			$this->addMeta('addfilter', 'invalid filter: ' . $this->input->get('filter'));
 			return;
 		}
-		foreach ($filter as $item) {
-			if (isset($item['usestdsem']) && $item['usestdsem'])
-				$item['studiensemester_kurzbz'] = $studiensemester_kurzbz;
-			if (!$this->PrestudentModel->addFilter($item)) {
-				$this->addMeta('addfilter', 'invalid filter: ' . json_encode($item));
-				return;
-			}
+		if (isset($filter['konto_count_0'])) {
+			$bt = $this->PrestudentModel->escape($filter['konto_count_0']);
+			$stdsem = $this->PrestudentModel->escape($studiensemester_kurzbz);
+
+			$this->PrestudentModel->db->where('(
+				SELECT count(*) 
+				FROM public.tbl_konto 
+				WHERE person_id=tbl_prestudent.person_id 
+				AND buchungstyp_kurzbz=' . $bt . ' 
+				AND studiensemester_kurzbz=' . $stdsem . '
+			) =', 0);
+			$this->PrestudentModel->db->where('get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) !=', 'Incoming');
+		}
+		if (isset($filter['konto_missing_counter'])) {
+			$bt = $this->PrestudentModel->escape($filter['konto_missing_counter']);
+			$stg = '';
+			if ($this->variablelib->getVar('kontofilterstg') == 'true')
+				$stg = ' AND studiengang_kz=tbl_prestudent.studiengang_kz';
+
+			$bt = $bt == 'alle' ? '' : ' AND buchungstyp_kurzbz=' . $bt;
+
+			$this->PrestudentModel->db->where('(
+				SELECT sum(betrag) 
+				FROM public.tbl_konto 
+				WHERE person_id=tbl_prestudent.person_id' .
+				$bt .
+				$stg . '
+			) !=', 0);
 		}
 	}
 }

application/controllers/api/frontend/v1/stv/Verband.php

@@ -165,17 +165,7 @@ class Verband extends FHCAPI_Controller
 		
 		$this->StudiengangModel->addDistinct();
 		$this->StudiengangModel->addSelect("CONCAT(" . $this->StudiengangModel->escape($link) . ", semester) AS link", false);
-		$this->StudiengangModel->addSelect("CONCAT(
-			UPPER(CONCAT(typ, kurzbz)), 
-			'-', 
-			semester, 
-			(
-				SELECT CASE WHEN bezeichnung IS NULL OR bezeichnung='' THEN ''::TEXT ELSE CONCAT(' (', bezeichnung, ')') END 
-				FROM public.tbl_lehrverband 
-				WHERE studiengang_kz=v.studiengang_kz AND semester=v.semester 
-				ORDER BY verband, gruppe LIMIT 1
-			)
-		) AS name", false);
+		$this->StudiengangModel->addSelect("CONCAT(UPPER(CONCAT(typ, kurzbz)), '-', semester, (SELECT CASE WHEN bezeichnung IS NULL OR bezeichnung='' THEN ''::TEXT ELSE CONCAT(' (', bezeichnung, ')') END FROM public.tbl_lehrverband WHERE studiengang_kz=v.studiengang_kz AND semester=v.semester ORDER BY verband, gruppe LIMIT 1)) AS name", false);
 
 		$this->StudiengangModel->addSelect('semester');
 		$this->StudiengangModel->addSelect($this->StudiengangModel->escape($studiengang_kz) . '::integer AS stg_kz', false);
@@ -183,7 +173,6 @@ class Verband extends FHCAPI_Controller
 		$this->StudiengangModel->addOrder('semester');
 
 		if ($org_form !== null) {
-			$this->StudiengangModel->addSelect("v.orgform_kurzbz");
 			$this->StudiengangModel->db->group_start();
 			$this->StudiengangModel->db->where('v.semester', 0);
 			$this->StudiengangModel->db->or_where('v.orgform_kurzbz', $org_form);
@@ -199,7 +188,6 @@ class Verband extends FHCAPI_Controller
 		array_unshift($list, [
 			'name' => 'PreStudent',
 			'link' => $link . 'prestudent',
-			'no_sem_reload' => true,
 			'stg_kz' => (int)$studiengang_kz,
 			'children' => $this->getStdSem($link . 'prestudent/', $studiengang_kz)
 		]);
@@ -215,7 +203,6 @@ class Verband extends FHCAPI_Controller
 					$this->StudienordnungModel->addDistinct();
 					$this->StudienordnungModel->addSelect("CONCAT(studiengang_kz, '/', p.orgform_kurzbz) AS link");
 					$this->StudienordnungModel->addSelect("p.orgform_kurzbz AS name");
-					$this->StudienordnungModel->addSelect("studiengang_kz AS stg_kz");
 
 					$this->StudienordnungModel->addJoin('lehre.tbl_studienplan p', 'studienordnung_id');
 
@@ -229,6 +216,7 @@ class Verband extends FHCAPI_Controller
 					$list = array_merge($list, $result);
 				}
 			}
+
 		}
 		$this->terminateWithSuccess($list);
 	}
@@ -284,7 +272,6 @@ class Verband extends FHCAPI_Controller
 		$this->StudiengangModel->addSelect("CONCAT(UPPER(CONCAT(typ, kurzbz)), '-', semester, verband, (SELECT CASE WHEN bezeichnung IS NULL OR bezeichnung='' THEN ''::TEXT ELSE CONCAT(' (', bezeichnung, ')') END FROM public.tbl_lehrverband WHERE studiengang_kz=v.studiengang_kz AND semester=v.semester AND verband=v.verband ORDER BY gruppe LIMIT 1)) AS name", false);
 		$this->StudiengangModel->addSelect("CASE WHEN MAX(gruppe)='' OR MAX(gruppe)=' ' THEN TRUE ELSE FALSE END AS leaf");
 
-		$this->StudiengangModel->addSelect($this->StudiengangModel->escape($semester) . ' AS semester');
 		$this->StudiengangModel->addSelect('verband');
 		$this->StudiengangModel->addSelect($this->StudiengangModel->escape($studiengang_kz) . '::integer AS stg_kz', false);
 		
@@ -333,8 +320,6 @@ class Verband extends FHCAPI_Controller
 		$this->StudiengangModel->addSelect("CONCAT(UPPER(CONCAT(typ, kurzbz)), '-', semester, verband, gruppe, (SELECT CASE WHEN bezeichnung IS NULL OR bezeichnung='' THEN ''::TEXT ELSE CONCAT(' (', bezeichnung, ')') END FROM public.tbl_lehrverband WHERE studiengang_kz=v.studiengang_kz AND semester=v.semester AND verband=v.verband AND gruppe=v.gruppe ORDER BY gruppe LIMIT 1)) AS name", false);
 		$this->StudiengangModel->addSelect("TRUE AS leaf", false);
 
-		$this->StudiengangModel->addSelect('v.semester');
-		$this->StudiengangModel->addSelect('v.verband');
 		$this->StudiengangModel->addSelect('gruppe');
 		$this->StudiengangModel->addSelect($this->StudiengangModel->escape($studiengang_kz) . '::integer AS stg_kz', false);
 		

application/controllers/api/frontend/v1/stv/Vertrag.php

@@ -1,104 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-class Vertrag extends FHCAPI_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'getVertrag' => ['admin:r', 'assistenz:r'],
-			'cancelVertrag' => ['admin:r', 'assistenz:r']
-		]);
-
-		// Load Libraries
-		$this->load->library('form_validation');
-
-		// Load language phrases
-		$this->loadPhrases([
-			'ui',
-			'person',
-			'projektarbeit'
-		]);
-
-		// Load models
-		$this->load->model('accounting/Vertrag_model', 'VertragModel');
-		$this->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
-		$this->load->model('person/Benutzer_model', 'BenutzerModel');
-
-		// load libraries
-		$this->load->library('PermissionLib');
-	}
-
-	public function getVertrag()
-	{
-		$vertrag_id = $this->input->get('vertrag_id');
-
-		if (!isset($vertrag_id) || !is_numeric($vertrag_id))
-			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Vertrag ID']), self::ERROR_TYPE_GENERAL);
-
-		$result = $this->VertragModel->getVertragById($vertrag_id);
-
-		if (isError($result))
-		{
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
-
-		if (!hasData($result)) $this->terminateWithSuccess([]);
-
-		$vertrag = getData($result)[0];
-
-		$this->terminateWithSuccess($vertrag);
-	}
-
-	public function cancelVertrag()
-	{
-		$vertrag_id = $this->input->post('vertrag_id');
-		$person_id = $this->input->post('person_id');
-
-		if (!isset($vertrag_id) || !is_numeric($vertrag_id))
-			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Vertrag ID']), self::ERROR_TYPE_GENERAL);
-		if (!isset($person_id) || !is_numeric($person_id))
-			$this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Person ID']), self::ERROR_TYPE_GENERAL);
-
-		// * first find lehrveranstaltung_id of the contracts lehrveranstaltung
-		$this->VertragModel->addSelect('lehrveranstaltung_id');
-		$this->VertragModel->addJoin('lehre.tbl_lehrveranstaltung', 'lehrveranstaltung_id', 'LEFT');
-		$result = $this->VertragModel->loadWhere(['vertrag_id' => $vertrag_id]);
-
-		if (isError($result)) $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-
-		if (!hasData($result)) $this->terminateWithSuccess([]);
-
-		$lehrveranstaltung_id = getData($result)[0]->lehrveranstaltung_id;
-
-		$allOe = $this->LehrveranstaltungModel->getAllOe($lehrveranstaltung_id);
-
-		if (isError($allOe)) $this->terminateWithError(getError($allOe), self::ERROR_TYPE_GENERAL);
-
-		$allOe = hasData($allOe) ? getData($allOe) : [];
-
-		$this->addMeta('oe', $allOe);
-
-		// * then check if the user has permissions to cancel the corresponding lv-organisational units
-		if (!$this->permissionlib->isBerechtigtMultipleOe('admin', $allOe, 'suid') &&
-			!$this->permissionlib->isBerechtigtMultipleOe('lehre/lehrauftrag_bestellen', $allOe, 'suid'))
-		{
-			return $this->_outputAuthError([$this->router->method => ['admin:rw', 'lehrauftrag_bestellen:rw']]);
-		}
-
-		$uidResult = $this->BenutzerModel->getFromPersonId($person_id);
-
-		if (isError($uidResult)) $this->terminateWithError(getError($uidResult), self::ERROR_TYPE_GENERAL);
-
-		if (!hasData($uidResult)) $this->terminateWithError("no user found", self::ERROR_TYPE_GENERAL);
-
-		$mitarbeiter_uid = getData($uidResult)[0]->uid;
-
-		$result = $this->VertragModel->cancelVertrag($vertrag_id, $mitarbeiter_uid);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
-}

application/controllers/api/frontend/v1/vorlagen/Vorlagen.php

@@ -51,17 +51,13 @@ class Vorlagen extends FHCAPI_Controller
 		$this->load->model('person/Benutzerfunktion_model', 'BenutzerfunktionModel');
 		$result = $this->BenutzerfunktionModel->getBenutzerfunktionByUid($uid, 'oezuordnung');
 
-		if (hasData($result))
-		{
-			$data = getData($result);
+		$data = $this->getDataOrTerminateWithError($result);
+		$oe_kurzbz = current($data);
 
-			$oe_kurzbz = array_column($data, 'oe_kurzbz');
-			$result = $this->VorlageModel->getAllVorlagenByOe($oe_kurzbz);
-
-			$this->terminateWithSuccess(hasData($result) ? getData($result) : array());
-		}
-		$this->terminateWithSuccess(array());
+		$result = $this->VorlageModel->getAllVorlagenByOe($oe_kurzbz->oe_kurzbz);
+		$data = $this->getDataOrTerminateWithError($result);
 
+		$this->terminateWithSuccess($data);
 	}
 
 }

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

@@ -233,10 +233,10 @@ class Person extends API_Controller
 				//Quersumme bilden
 				for ($i = 0; $i < 10; $i++)
 				{
-					$erg += $gewichtung[$i] * $tmpSvnr[$i];
+					$erg += $gewichtung[$i] * $tmpSvnr{$i};
 				}
 
-				if ($tmpSvnr[3] != ($erg % 11)) //Vergleichen der Pruefziffer mit Quersumme Modulo 11
+				if ($tmpSvnr{3} != ($erg % 11)) //Vergleichen der Pruefziffer mit Quersumme Modulo 11
 				{
 					return error('SVNR ist ungueltig');
 				}
@@ -244,7 +244,7 @@ class Person extends API_Controller
 				if (mb_strlen($person['svnr']) == 12)
 				{
 					$last = substr($person['svnr'], 10, 12);
-					if ($last[0] != 'v' || !is_numeric($last[1]))
+					if ($last{0} != 'v' || !is_numeric($last{1}))
 					{
 						return error('SVNR ist ungueltig');
 					}

application/controllers/jobs/AntragJob.php

@@ -200,14 +200,13 @@ class AntragJob extends JOB_Controller
 	}
 
 	/**
-	 * Send reminder to Assistant and to Student for Wiedereinstieg Unterbrecher
+	 * Send reminder to Assistant for Wiedereinstieg Unterbrecher
 	 *
 	 */
 	public function sendReminderWiedereinstieg()
 	{
 		$now = new DateTime();
 		$modifier = $this->config->item('unterbrechung_job_remind_wiedereinstieg_date_modifier');
-
 		if (!$modifier)
 			return $this->logError('Konnte Job nicht starten: Config "unterbrechung_job_remind_wiedereinstieg_date_modifiers" nicht gesetzt');
 
@@ -231,7 +230,6 @@ class AntragJob extends JOB_Controller
 
 		$antraege = getData($result) ?: [];
 		$count = 0;
-		$countReminderStudent = 0;
 		foreach ($antraege as $antrag)
 		{
 			$res = $this->StudierendenantragModel->getStgAndSem($antrag->studierendenantrag_id);
@@ -259,92 +257,10 @@ class AntragJob extends JOB_Controller
 				$data['UID'] = $student->student_uid;
 			}
 
-			//Data für Email Student
-			$result = $this->PrestudentModel->load($antrag->prestudent_id);
-			$dataPrestudent = current(getData($result));
-			$person_id = $dataPrestudent->person_id;
-
-			$this->KontaktModel->addSelect('kontakt');
-
-			$result = $this->KontaktModel->loadWhere([
-				'person_id'=> $person_id,
-				'zustellung' => true,
-				'kontakttyp' => 'email'
-			]);
-
-			$email_student_privat = null;
-			$dataKontakt = getData($result);
-			if ($dataKontakt) {
-				$stud_private_zustell_emails = array_map(function($kontakt) {
-					return $kontakt->kontakt;
-				}, $dataKontakt);
-				$email_student_privat = implode(', ', $stud_private_zustell_emails);
-			}
-
-			$email_student_FH = $this->StudentModel->getEmailFH($this->StudentModel->getUID($antrag->prestudent_id));
-
-			//studiensemester
-			$result = $this->StudiensemesterModel->getByDate($datum->format('Y-m-d'));
-			if (hasData($result)) {
-				$dataSem = current(getData($result));
-			}
-
-			$studiensemester = $dataSem->studiensemester_kurzbz;
-			$studsemShort = substr($studiensemester, 0, 2);
-
-			if($studsemShort == "SS")
-			{
-				$data['studSemShort_Eng'] = "summer semester";
-				$data['meldenBis'] = "15.1.";
-				$data['meldenBis_Eng'] = "January 15";
-			}
-			elseif ($studsemShort == "WS") {
-				$data['studSemShort_Eng'] = "winter semester";
-				$data['meldenBis'] = "1.8.";
-				$data['meldenBis_Eng'] = "August 1";
-			}
-			else
-			{
-				$studsemShort = "SS/WS";
-				$data['studSemShort_Eng'] = "summer/winter semester";
-				$data['meldenBis'] = "15.1. (bei Einstieg ins SS) / 1.8. (bei Einstieg ins WS)";
-				$data['meldenBis_Eng'] = "January 15 (for sommer semester enrollment) / August 1 (for winter semester enrollment)";
-			}
-
-			$data['studSemShort'] = $studsemShort;
-
-			// NOTE(chris): Sancho mail Assistant
-			$sancho_assistant_sent = sendSanchoMail('Sancho_Mail_Antrag_U_Reminder', $data, $antrag->email, 'Reminder: Unterbrechung Wiedereinstieg');
-			if($sancho_assistant_sent)
+			// NOTE(chris): Sancho mail
+			if(sendSanchoMail('Sancho_Mail_Antrag_U_Reminder', $data, $antrag->email, 'Reminder: Unterbrechung Wiedereinstieg'))
 			{
 				$count++;
-			}
-			else
-			{
-				$this->logError('Error: failed to send Assistant Reminder studierendenantrag_id: ' . $antrag->studierendenantrag_id);
-			}
-			//Mail to Student
-			$sancho_student_sent = sendSanchoMail(
-				'Sancho_Mail_Antrag_U_Remind_Stud',
-				$data,
-				$email_student_FH,
-				'Reminder: Unterbrechung Wiedereinstieg',
-				'',
-				'',
-				'',
-				$email_student_privat);
-
-			if($sancho_student_sent)
-			{
-				$countReminderStudent++;
-			}
-			else
-			{
-				$this->logError('Error: failed to send Student Reminder studierendenantrag_id: ' . $antrag->studierendenantrag_id);
-			}
-
-			if($sancho_assistant_sent && $sancho_student_sent)
-			{
 				$this->StudierendenantragstatusModel->insert([
 					'studierendenantrag_id' => $antrag->studierendenantrag_id,
 					'studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_REMINDERSENT,
@@ -352,7 +268,7 @@ class AntragJob extends JOB_Controller
 				]);
 			}
 		}
-		$this->logInfo($count . ' Reminder an Assistenz und ' . $countReminderStudent . ' Reminder an Student gesendet  - Ende Job sendReminderWiedereinstieg');
+		$this->logInfo($count . ' Reminder gesendet - Ende Job sendReminderWiedereinstieg');
 	}
 
 	/**

application/controllers/jobs/MeldezettelJob.php

@@ -1,86 +0,0 @@
-<?php
-
-if (!defined('BASEPATH')) exit('No direct script access allowed');
-
-class MeldezettelJob extends JOB_Controller
-{
-	const INSERT_VON = 'meldezetteljob';
-	const DOKUMENT_KURZBZ = 'Meldezet';
-
-	private $_ci; // Code igniter instance
-
-	public function __construct()
-	{
-		parent::__construct();
-
-		$this->_ci =& get_instance();
-
-		$this->_ci->load->model('crm/Dokumentprestudent_model', 'DokumentprestudentModel');
-	}
-
-	/**
-	 * Sets Meldezettel to "accepted" for all students with Meldeadresse.
-	 */
-	public function acceptMeldezettel()
-	{
-		$this->logInfo('Start Meldezettel Job');
-
-		$params = array(self::DOKUMENT_KURZBZ);
-
-		$qry = "
-			-- get all prestudents with meldeadresse, but no accepted Meldezettel
-			SELECT
-				DISTINCT prestudent_id
-			FROM
-				public.tbl_adresse
-				JOIN public.tbl_person USING (person_id)
-				JOIN public.tbl_prestudent ps USING (person_id)
-			WHERE
-				typ = 'm'
-				AND NOT EXISTS (
-					SELECT
-						1
-					FROM
-						public.tbl_dokumentprestudent
-					WHERE
-						prestudent_id = ps.prestudent_id
-						AND dokument_kurzbz = ?
-				)";
-
-		// get all prestudents with Meldeadresse and no accpeted Meldezettel
-		$result = $this->_ci->DokumentprestudentModel->execReadOnlyQuery($qry, $params);
-
-		if (isError($result))
-		{
-			$this->logError(getError($result));
-		}
-
-		$count = 0;
-
-		if (hasData($result))
-		{
-			$prestudents = getData($result);
-
-			foreach ($prestudents as $prestudent)
-			{
-				// set Meldezettel to accepted
-				$result = $this->_ci->DokumentprestudentModel->insert(
-					array(
-						'prestudent_id' => $prestudent->prestudent_id,
-						'dokument_kurzbz' => self::DOKUMENT_KURZBZ,
-						'datum' => date('Y-m-d'),
-						'insertamum' => strftime('%Y-%m-%d %H:%M'),
-						'insertvon' => self::INSERT_VON
-					)
-				);
-
-				if (isError($result))
-					$this->logError(getError($result));
-				else
-					$count++;
-			}
-		}
-
-		$this->logInfo('End Meldezettel Job', array('Number of changes ' => $count));
-	}
-}

application/controllers/system/infocenter/InfoCenter.php

@@ -22,7 +22,6 @@ class InfoCenter extends Auth_Controller
 	const REIHUNGSTESTABSOLVIERT_PAGE = 'reihungstestAbsolviert';
 	const ABGEWIESEN_PAGE = 'abgewiesen';
 	const AUFGENOMMEN_PAGE = 'aufgenommen';
-	const ONBOARDING_PAGE = 'onboarding';
 	const SHOW_DETAILS_PAGE = 'showDetails';
 	const SHOW_ZGV_DETAILS_PAGE = 'showZGVDetails';
 	const ZGV_UBERPRUEFUNG_PAGE = 'ZGVUeberpruefung';
@@ -117,7 +116,6 @@ class InfoCenter extends Auth_Controller
 				'index' => 'infocenter:r',
 				'freigegeben' => 'infocenter:r',
 				'abgewiesen' => 'infocenter:r',
-				'onboarding' => 'infocenter:r',
 				'aufgenommen' => 'infocenter:r',
 				'reihungstestAbsolviert' => 'infocenter:r',
 				'showDetails' => 'infocenter:r',
@@ -232,13 +230,6 @@ class InfoCenter extends Auth_Controller
 
 		$this->load->view('system/infocenter/infocenterAbgewiesen.php');
 	}
-
-	public function onboarding()
-	{
-		$this->_setNavigationMenu(self::ONBOARDING_PAGE); // define the navigation menu for this page
-
-		$this->load->view('system/infocenter/onboarding.php');
-	}
 	
 	/**
 	 * Aufgenommene page of the InfoCenter tool
@@ -1562,7 +1553,6 @@ class InfoCenter extends Auth_Controller
 		$reihungstestAbsolviertLink = site_url(self::INFOCENTER_URI.'/'.self::REIHUNGSTESTABSOLVIERT_PAGE);
 		$abgewiesenLink = site_url(self::INFOCENTER_URI.'/'.self::ABGEWIESEN_PAGE);
 		$aufgenommenLink = site_url(self::INFOCENTER_URI.'/'.self::AUFGENOMMEN_PAGE);
-		$onboardingLink = site_url(self::INFOCENTER_URI.'/'.self::ONBOARDING_PAGE);
 
 		$currentFilterId = $this->input->get(self::FILTER_ID);
 		if (isset($currentFilterId))
@@ -1571,7 +1561,6 @@ class InfoCenter extends Auth_Controller
 			$reihungstestAbsolviertLink .= '?'.self::PREV_FILTER_ID.'='.$currentFilterId;
 			$abgewiesenLink .= '?'.self::PREV_FILTER_ID.'='.$currentFilterId;
 			$aufgenommenLink .= '?'.self::PREV_FILTER_ID.'='.$currentFilterId;
-			$onboardingLink .= '?'.self::PREV_FILTER_ID.'='.$currentFilterId;
 		}
 
 		$this->navigationlib->setSessionMenu(
@@ -1635,18 +1624,6 @@ class InfoCenter extends Auth_Controller
 					'', 				// target
 					40   				// sort
 				),
-				'ohnePrestudent' => $this->navigationlib->oneLevel(
-					'Electronic Onboarding',		// description
-					$onboardingLink,	// link
-					null,				// children
-					'users',		// icon
-					null,				// subscriptDescription
-					false,				// expand
-					null,				// subscriptLinkClass
-					null, 				// subscriptLinkValue
-					'', 				// target
-					50   				// sort
-				),
 			)
 		);
 	}
@@ -1673,8 +1650,6 @@ class InfoCenter extends Auth_Controller
 			$link = site_url(self::ZGV_UEBERPRUEFUNG_URI);
 		if ($origin_page === self::ABGEWIESEN_PAGE)
 			$link = site_url(self::INFOCENTER_URI.'/'.self::ABGEWIESEN_PAGE);
-		if ($origin_page === self::ONBOARDING_PAGE)
-			$link = site_url(self::INFOCENTER_URI.'/'.self::ONBOARDING_PAGE);
 
 		if ($origin_page === self::AUFGENOMMEN_PAGE)
 			$link = site_url(self::INFOCENTER_URI.'/'.self::AUFGENOMMEN_PAGE);
@@ -1716,7 +1691,6 @@ class InfoCenter extends Auth_Controller
 		$freigegebenLink = site_url(self::INFOCENTER_URI.'/'.self::FREIGEGEBEN_PAGE);
 		$absolviertLink = site_url(self::INFOCENTER_URI.'/'.self::REIHUNGSTESTABSOLVIERT_PAGE);
 		$abgewiesenLink = site_url(self::INFOCENTER_URI.'/'.self::ABGEWIESEN_PAGE);
-		$onboardingLink = site_url(self::INFOCENTER_URI.'/'.self::ONBOARDING_PAGE);
 		$prevFilterId = $this->input->get(self::PREV_FILTER_ID);
 		if (isset($prevFilterId))
 		{
@@ -1793,24 +1767,6 @@ class InfoCenter extends Auth_Controller
 				)
 			);
 		}
-		if($page == self::ONBOARDING_PAGE)
-		{
-			$this->navigationlib->setSessionElementMenu(
-				'onboarding',
-				$this->navigationlib->oneLevel(
-					'Electronic Onboarding',		// description
-					$onboardingLink,	// link
-					null,				// children
-					'users',			// icon
-					null,				// subscriptDescription
-					false,				// expand
-					null,				// subscriptLinkClass
-					null, 				// subscriptLinkValue
-					'', 				// target
-					50   				// sort
-				)
-			);
-		}
 	}
 
 	/**

application/core/Auth_Controller.php

@@ -70,22 +70,20 @@ abstract class Auth_Controller extends FHC_Controller
 	/**
 	 * Checks for Permissions depending if the given person is a
 	 * Mitarbeiter and/or Student
-	 * If neither Student nor Mitarbeiter, default permissions are checked
 	 * and exits/outputs an error if they are not met.
 	 *
 	 * @param integer 				$person_id
 	 * @param array 				$permMa		Perms if the person is a Mitarbeiter
 	 * @param array 				$permStud	Perms if the person is a Student
-	 * @param array 				$permDefault	Perms if the person is neither a Student nor a Mitarbeiter
 	 *
 	 * @return void
 	 */
-	protected function checkPermissionsForPerson($person_id, $permMa, $permStud, $permDefault = null)
+	protected function checkPermissionsForPerson($person_id, $permMa, $permStud)
 	{
-		$res = $this->hasPermissionsForPerson($person_id, $permMa, $permStud, $permDefault);
-
+		$res = $this->hasPermissionsForPerson($person_id, $permMa, $permStud);
+		
 		if ($res) {
-			$perm = array_keys(array_flip(array_merge($res&1 ? $permMa : [], $res&2 ? $permStud : [], $res&4 ? $permDefault : [])));
+			$perm = array_keys(array_flip(array_merge($res|1 ? $permMa : [], $res|2 ? $permStud : [])));
 			$this->_outputAuthError([$this->router->method => $perm]);
 		}
 	}
@@ -110,19 +108,16 @@ abstract class Auth_Controller extends FHC_Controller
 	 * Checks for Permissions depending if the given person is a
 	 * Mitarbeiter and/or Student
 	 * and returns the result.
-	 * If neither Student nor Mitarbeiter, default permissions are checked
-	 * 
+	 *
 	 * @param integer 				$person_id
 	 * @param array 				$permMa		Perms if the person is a Mitarbeiter
 	 * @param array 				$permStud	Perms if the person is a Student
-	 * @param array 				$permDefault	Perms if the person is neither a Student nor a Mitarbeiter
+	 *
 	 * @return integer				0 if permission is granted
 	 */
-	protected function hasPermissionsForPerson($person_id, $permMa, $permStud, $permDefault)
+	protected function hasPermissionsForPerson($person_id, $permMa, $permStud)
 	{
-		$res = 8;
-		$isMitarbeiter = false;
-		$isStudent = false;
+		$res = 3;
 		$this->load->model('person/Person_model', 'PersonModel');
 		$this->PersonModel->addJoin('public.tbl_benutzer', 'person_id');
 		$this->PersonModel->addJoin('public.tbl_mitarbeiter', 'uid = mitarbeiter_uid');
@@ -130,8 +125,7 @@ abstract class Auth_Controller extends FHC_Controller
 		if (hasData($result)) {
 			if ($this->permissionlib->isEntitled(['a' => $permMa], 'a'))
 				return 0;
-			$isMitarbeiter = true;
-			$res += 1;
+			$res = 1;
 		}
 		$this->PersonModel->addJoin('public.tbl_prestudent', 'person_id');
 		$result = $this->PersonModel->load($person_id);
@@ -146,15 +140,8 @@ abstract class Auth_Controller extends FHC_Controller
 						return 0;
 				}
 			}
-			$isStudent = true;
 			$res += 2;
 		}
-		if (isset($permDefault) && !$isMitarbeiter && !$isStudent)
-		{
-			if ($this->permissionlib->isEntitled(['a' => $permDefault], 'a'))
-				return 0;
-			$res += 4;
-		}
 		return $res;
 	}
 

application/helpers/hlp_common_helper.php

@@ -515,73 +515,3 @@ function has_permissions_for_stg($studiengang_kz, $permissions = '')
 
 	return false;
 }
-
-/**
- * check if an entry exists in the database
- */
-function is_in_db($key, $model = '')
-{
-	if (!$model)
-		return false;
-
-	$field = strstr($model, ":");
-	if ($field) {
-		$model = strstr($model, ":", true);
-		$field = substr($field, 1);
-	}
-
-	$CI =& get_instance();
-	$CI->load->model($model, $model);
-
-	if ($field) {
-		$result = $CI->$model->loadWhere([
-			$field => $key
-		]);
-	} else {
-		$result = $CI->$model->load($key);
-	}
-
-	return (isSuccess($result) && hasData($result));
-}
-
-/**
- * is building an array for Dropdown Entry in Print Dropdown
- * @param $id id for the Document to add to the Document Array
- * @param $name title of the dropdownEntry
- * @param $parameterUrl url of parameters xml, xsl, format etc as needed
- * 	WITHOUT BASEURL eg. "xml=abschlusspruefung.rdf.php&xsl_stg_kz=$studiengang_kz&xsl=Bescheid&output=pdf"
- * @param $uid default parameter, if null only parameterurl will be added
- * 	additional needed parameter: put in the parameterUrl
- * @param $alternativeBaseUrl: if baseUrl not pdfExport.php, put here alternative without ? char, eg. "zutrittskarte.php"
- *
- * @return Array
- */
-function buildDropdownEntryPrintArray($id, $name, $parameterurl, $uid=null, $order=null, $alternativeBaseUrl=null)
-{
-	//DEFAULT BASEURL
-	$baseurl = "pdfExport.php?";
-
-	$uidString = $uid ? "&uid=" . $uid : "";
-
-
-
-	if($alternativeBaseUrl)
-	{
-		return [
-			"id"    => $id,
-			"type"  => "documenturl",
-			"name"  => $name,
-			"url"   => $alternativeBaseUrl . "?" . $parameterurl . $uidString,
-			"order" => $order
-		];
-	}
-	else
-		return [
-			"id"    => $id,
-			"type"  => "documenturl",
-			"name"  => $name,
-			"url"   => $baseurl . $parameterurl . "&uid=" . $uid,
-			"order" => $order
-		];
-
-}

application/helpers/hlp_header_helper.php

@@ -246,10 +246,3 @@ function generateSkipLink($skipID)
 	$toPrint.='" class="fhcSkipLink" aria-label="Skip to main content"></a>';
 	echo $toPrint;
 }
-
-function absoluteJsImportUrl($relurl)
-{
-	$ci =& get_instance();
-	$url = base_url($relurl) . '?'. $ci->config->item('fhcomplete_build_version');
-	return $url;
-}

application/language/english/form_validation_lang.php

@@ -41,4 +41,3 @@ if (!defined('BASEPATH')) exit('No direct script access allowed');
 $lang['form_validation_has_write_permissions']	= 'You have no rights to edit {field} field.';
 $lang['form_validation_is_valid_date']	= 'The date format is invalid or out of range.';
 $lang['form_validation_has_permissions_for_stg']	= 'You have no rights for stg {field}.';
-$lang['form_validation_is_in_db']	= '{field} does not exist.';

application/libraries/FilterCmptLib.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright (C) 2025 fhcomplete.org
+ * 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
@@ -177,7 +177,7 @@ class FilterCmptLib
 		$session = $this->getSession();
 
 		// If session is NOT empty -> a filter was already loaded
-		if (!isError($session) && $session != null)
+		if ($session != null)
 		{
 			// Retrieve the filterId stored in the session
 			$sessionFilterId = $this->_getSessionElement(FilterCmptLib::FILTER_ID);
@@ -219,7 +219,9 @@ class FilterCmptLib
 				}
 			}
 		}
-		else
+
+		// If the session is empty -> first time that this filter is loaded
+		if ($session == null)
 		{
 			// Load filter definition data from DB
 			$definition = $this->_loadDefinition(
@@ -600,7 +602,7 @@ class FilterCmptLib
 	{
 		$session = getSessionElement(self::SESSION_NAME, $this->_filterUniqueId);
 
-		if (!isError($session) && isset($session[$name]))
+		if (isset($session[$name]))
 		{
 			return $session[$name];
 		}
@@ -621,7 +623,7 @@ class FilterCmptLib
 
 		if (!$this->_ci->permissionlib->hasAtLeastOne($this->_requiredPermissions, self::PERMISSION_FILTER_METHOD, self::PERMISSION_TYPE))
 		{
-			$this->_setSession(error('The required permission is not held by the logged user'));
+			$this->_setSession(error('The required permission is not help by the logged user'));
 			return false;
 		}
 
@@ -902,7 +904,7 @@ class FilterCmptLib
 		$filterCmptsSession = getSession(self::SESSION_NAME);
 
 		// If something is present in session
-		if (!isError($filterCmptsSession) && $filterCmptsSession != null)
+		if ($filterCmptsSession != null)
 		{
 			// Loops in the session for all the filter components
 			foreach ($filterCmptsSession as $filterCmpt => $filterCmptData)
@@ -949,11 +951,9 @@ class FilterCmptLib
 	{
 		$session = getSessionElement(self::SESSION_NAME, $this->_filterUniqueId);
 
-		if (!isError($session) && $session != null)
-		{
-			$session[$name] = $value;
-			setSessionElement(self::SESSION_NAME, $this->_filterUniqueId, $session); // stores the single value
-		}
+		$session[$name] = $value;
+
+		setSessionElement(self::SESSION_NAME, $this->_filterUniqueId, $session); // stores the single value
 	}
 
 	/**
@@ -965,7 +965,7 @@ class FilterCmptLib
 		$filterCmptsSession = getSession(self::SESSION_NAME);
 
 		// If something is present in session
-		if (!isError($filterCmptsSession) && $filterCmptsSession != null)
+		if ($filterCmptsSession != null)
 		{
 			// Loops in the session for all the filter components
 			foreach ($filterCmptsSession as $filterCmpt => $filterCmptData)
@@ -1174,4 +1174,3 @@ class FilterCmptLib
 		return $filterName;
 	}
 }
-

application/libraries/LektorLib.php

@@ -17,7 +17,6 @@ class LektorLib
 		$this->_ci->load->model('organisation/Organisationseinheit_model', 'OrganisationseinheitModel');
 		$this->_ci->load->model('ressource/mitarbeiter_model', 'MitarbeiterModel');
 		$this->_ci->load->model('person/Benutzer_model', 'BenutzerModel');
-		$this->_ci->load->library('PhrasesLib', array('lehre'));
 	}
 
 	public function addLektorToLehreinheit($lehreinheit_id, $mitarbeiter_uid)
@@ -36,7 +35,7 @@ class LektorLib
 
 		if (isError($already_assigned)) return $already_assigned;
 
-		if (hasData($already_assigned)) return error($this->_ci->phraseslib->t("lehre", "bereitzugeteilt"));
+		if (hasData($already_assigned)) return error('Lektor already assigned');
 
 		$studiensemester_result = $this->_ci->StudiensemesterModel->loadWhere(array('studiensemester_kurzbz' => $lehreinheit->studiensemester_kurzbz));
 		if (isError($studiensemester_result)) return $studiensemester_result;
@@ -89,7 +88,6 @@ class LektorLib
 
 		$lehreinheit = getData($lehreinheit_result)[0];
 
-
 		//TODO kollision check, wird vorerst nicht implementiert -> nur über das FAS möglich
 		if (isset($new_data['mitarbeiter_uid']) && $new_data['mitarbeiter_uid'] !== $mitarbeiter_uid)
 		{
@@ -100,13 +98,7 @@ class LektorLib
 			$verplant = $this->_ci->StundenplandevModel->loadWhere(array('lehreinheit_id' => $lehreinheit_id, 'mitarbeiter_uid' => $mitarbeiter_uid));
 
 			if (hasData($verplant))
-				return error($this->_ci->phraseslib->t("lehre", "lektorbereitsverplant"));
-
-			$lehreinheit_data = $this->_ci->LehreinheitmitarbeiterModel->loadWhere(array('mitarbeiter_uid' => $new_data['mitarbeiter_uid'], 'lehreinheit_id' => $lehreinheit_id));
-
-			if (hasData($lehreinheit_data))
-				return error($this->_ci->phraseslib->t("lehre", "bereitzugeteilt"));
-
+				return error('Wechsel vom Mitarbeiter nicht möglich da er bereits verplant ist!');
 		}
 		$warning = '';
 		if (isset($new_data['semesterstunden']))

application/libraries/PrestudentLib.php

@@ -35,90 +35,6 @@ class PrestudentLib
 		$this->_ci->load->model('organisation/Studiengang_model', 'StudiengangModel');
 	}
 
-	/**
-	 * Sets initial prestudent entry, no status yet.
-	 * @return object success or error
-	 */
-	public function setPrestudent(
-		$person_id,
-		$studiengang_kz,
-		$ausbildungscode,
-		$anmerkung,
-		$foerderrelevant
-	)
-	{
-		// Prestudent anlegen
-		$data = [
-			'aufmerksamdurch_kurzbz' => 'k.A.',
-			'person_id' => $person_id,
-			'studiengang_kz' => $studiengang_kz,
-			'ausbildungcode' => $ausbildungscode,
-			'anmerkung' => $anmerkung,
-			'reihungstestangetreten' => false,
-			'bismelden' => true,
-			'foerderrelevant' => $foerderrelevant,
-			'insertamum' => date('c'),
-			'insertvon' => getAuthUID()
-		];
-
-		// Wenn die Person schon im System erfasst ist, dann die ZGV des Datensatzes uebernehmen
-		$this->_ci->PrestudentModel->addSelect('public.tbl_prestudent.*, public.tbl_person.vorname, public.tbl_person.nachname');
-		$this->_ci->PrestudentModel->addJoin('public.tbl_person', 'person_id');
-		$this->_ci->PrestudentModel->addOrder('zgvmas_code');
-		$this->_ci->PrestudentModel->addOrder('zgv_code', 'DESC');
-		$this->_ci->PrestudentModel->addLimit(1);
-		$result = $this->_ci->PrestudentModel->loadWhere([
-			'person_id' => $person_id,
-			'zgv_code IS NOT NULL' => null
-		]);
-
-		if (isError($result)) return $result;
-
-		if (hasData($result)) {
-			$prestudent = getData($result)[0];
-			if ($prestudent->zgv_code) {
-				$data['zgv_code'] = $prestudent->zgv_code;
-				$data['zgvort'] = $prestudent->zgvort;
-				$data['zgvdatum'] = $prestudent->zgvdatum;
-
-				$data['zgvmas_code'] = $prestudent->zgvmas_code;
-				$data['zgvmaort'] = $prestudent->zgvmaort;
-				$data['zgvmadatum'] = $prestudent->zgvmadatum;
-			}
-		}
-		// Prestudent speichern
-		return $this->_ci->PrestudentModel->insert($data);
-	}
-
-	/**
-	 * Sets first status of a prestudent.!
-	 * @return object success or error
-	 */
-	public function setFirstStatus(
-		$prestudent_id,
-		$status_kurzbz,
-		$studiensemester_kurzbz,
-		$ausbildungssemester = null,
-		$orgform_kurzbz = null,
-		$studienplan_id = null
-	)
-	{
-		// Prestudent Rolle Anlegen
-		$data = [
-			'prestudent_id' => $prestudent_id,
-			'status_kurzbz' => $status_kurzbz,
-			'studiensemester_kurzbz' => $studiensemester_kurzbz,
-			'ausbildungssemester' => $ausbildungssemester ?: 0,
-			'orgform_kurzbz' => $orgform_kurzbz ?: null,
-			'studienplan_id' => $studienplan_id ?: null,
-			'datum' => date('Y-m-d'),
-			'insertamum' => date('c'),
-			'insertvon' => getAuthUID()
-		];
-
-		return  $this->_ci->PrestudentstatusModel->insert($data);
-	}
-
 	public function setAbbrecher(
 		$prestudent_id,
 		$studiensemester_kurzbz,
@@ -687,6 +603,9 @@ class PrestudentLib
 		$now = date('c');
 		$today = date('Y-m-d');
 
+		$jahr = mb_substr($studiensemester_kurzbz, 4, 2);
+
+
 		// Genererate Personenkennzeichen
 		$personenkennzeichen = $this->_ci->StudentModel->generateMatrikelnummer2(
 			$student_data->studiengang_kz,
@@ -696,9 +615,8 @@ class PrestudentLib
 		if (isError($personenkennzeichen))
 			return $personenkennzeichen;
 		$personenkennzeichen = getData($personenkennzeichen);
-
-		$jahr = mb_substr($personenkennzeichen, 0, 2);
-
+		
+		
 		// Generate UID
 		$uid = $this->_ci->StudentModel->generateUID(
 			$student_data->kurzbz,
@@ -971,155 +889,6 @@ class PrestudentLib
 		);
 	}
 
-	/**
-	 * Creates an incoming, saves necessary data for an incoming. 
-	 * @param $prestudent_id existing prestudent, for which incoming entry is created
-	 * @param $studiengang_kz Studiengang assigned to incoming
-	 * @param $studiensemester_kurzbz start semester for incoming
-	 * @return object success if incoming successfully saved, or error
-	 */
-	public function setFirstIncoming($prestudent_id, $studiengang_kz, $studiensemester_kurzbz, $orgform_kurzbz, $studienplan_id)
-	{
-		// Verband and Ausbildungssemester for incoming
-		$authUID = getAuthUID();
-		$incomingVerband = 'I';
-		$incomingAusbildungssemester = '0';
-
-		// get prestudent
-		$this->_ci->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
-		$this->_ci->PrestudentModel->addJoin('public.tbl_studiengang stg', 'studiengang_kz');
-		$result = $this->_ci->PrestudentModel->load($prestudent_id);
-
-		if (isError($result)) return $result;
-		if (!hasData($result)) return error('No prestudent');
-
-		$student_data = getData($result)[0];
-
-		$result = $this->setFirstStatus(
-			$prestudent_id,
-			$this->_ci->PrestudentstatusModel::STATUS_INCOMING,
-			$studiensemester_kurzbz,
-			$incomingAusbildungssemester,
-			$orgform_kurzbz,
-			$studienplan_id
-		);
-		if (isError($result)) return $result;
-		if (!hasData($result)) return error('Error when adding prestudentstatus');
-
-		// generate Personenkennzeichen
-		$result = $this->_ci->StudentModel->generateMatrikelnummer2($studiengang_kz, $studiensemester_kurzbz);
-		if (isError($result)) return $result;
-		if (!hasData($result)) return error('No personenkennzeichen could be generated');
-
-		$personenkennzeichen = getData($result);
-
-		$jahr = mb_substr($personenkennzeichen, 0, 2);
-		$stg = mb_substr($personenkennzeichen, 3, 4);
-
-		$nachname_clean = mb_strtolower(sanitizeProblemChars($student_data->nachname));
-		$vorname_clean = mb_strtolower(sanitizeProblemChars($student_data->vorname));
-		$nachname_clean = str_replace(' ','_', $nachname_clean);
-		$vorname_clean = str_replace(' ','_', $vorname_clean);
-
-		// get Studiengang data
-		$result = $this->_ci->StudiengangModel->load(ltrim($stg, '0'));
-		if (isError($result)) return $result;
-		if (!hasData($result)) return error('No Studiengang');
-
-		$stgObj = getData($result)[0];
-
-		// gernerate uid
-		$result = $this->_ci->StudentModel->generateUID($stgObj->kurzbz, $jahr, $stgObj->typ, $personenkennzeichen, $vorname_clean, $nachname_clean);
-		if (isError($result)) return $result;
-		if (!hasData($result)) return error("UID could not be generated");
-		$uid = getData($result);
-
-		//Benutzerdatensatz anlegen
-		$benutzer = [
-			'uid' => $uid,
-			'person_id' => $student_data->person_id,
-			'aktiv' => true,
-			'aktivierungscode' => $this->_ci->BenutzerModel->generateActivationkey()
-		];
-
-		// Generate Alias
-		$alias = '';
-		if (!defined('GENERATE_ALIAS_STUDENT') || GENERATE_ALIAS_STUDENT === true)
-		{
-			$result = $this->_ci->BenutzerModel->generateAliasFromName($student_data->vorname, $student_data->nachname);
-			if (isError($result))
-				return $result;
-			$alias = getData($result);
-		}
-
-		$benutzer['alias'] = $alias;
-		$benutzer['insertamum'] = date('Y-m-d H:i:s');
-		$benutzer['insertvon'] = $authUID;
-
-		$result = $this->_ci->BenutzerModel->insert($benutzer);
-
-		if (isError($result)) return $result;
-
-		// Studentendatensatz anlegen
-		$student = [
-			'student_uid' => $uid,
-			'matrikelnr' => $personenkennzeichen,
-			'prestudent_id' => $prestudent_id,
-			'studiengang_kz' => $studiengang_kz,
-			'semester' => $incomingAusbildungssemester,
-			'verband' => $incomingVerband,
-			'gruppe' => ' '
-		];
-
-		$result = $this->_ci->LehrverbandModel->loadWhere([
-				'studiengang_kz' => $student['studiengang_kz'],
-				'semester' => $student['semester'],
-				'verband' => $student['verband'],
-				'gruppe' => $student['gruppe']
-			]);
-
-		if (isError($result)) return $result;
-
-		if (!hasData($result))
-		{
-			// Add Lehrverband if it does not exist
-			$result = $this->_ci->LehrverbandModel->insert([
-				'studiengang_kz' => $student_data->studiengang_kz,
-				'semester' => $student['semester'],
-				'verband' => $student['verband'],
-				'gruppe' => $student['gruppe'],
-				'bezeichnung' => 'Incoming',
-				'aktiv' => true
-			]);
-
-			if (isError($result)) return $result;
-		}
-
-		// add student
-		$student['insertamum'] = date('Y-m-d H:i:s');
-		$student['insertvon'] = $authUID;
-
-		$result = $this->_ci->StudentModel->insert($student);
-		if (isError($result)) return $result;
-
-		// Add Studentlehrverband
-		$result = $this->_ci->StudentlehrverbandModel->insert([
-			'student_uid' => $uid,
-			'studiensemester_kurzbz' => $studiensemester_kurzbz,
-			'studiengang_kz' => $student_data->studiengang_kz,
-			'semester' => $incomingAusbildungssemester,
-			'verband' => $incomingVerband,
-			'gruppe' => ' ',
-			'insertamum' => date('Y-m-d H:i:s'),
-			'insertvon' => $authUID
-		]);
-
-		if (isError($result))
-			return $result;
-
-		return success($prestudent_id);
-	}
-
 	protected function setBasic($authUID, $now, $status_kurzbz, $prestudent_id, $studiensemester_kurzbz, $ausbildungssemester, $statusgrund_id = null)
 	{
 		$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id);

application/libraries/ProfilLib.php

@@ -183,10 +183,7 @@ class ProfilLib{
 		$zutrittskarte_ausgegebenam = $zutrittskarte_ausgegebenam ? current($zutrittskarte_ausgegebenam)->ausgegebenam : null;
 		
 		//? formats date from 01-01-2000 to 01.01.2000
-		if ($zutrittskarte_ausgegebenam !== NULL)
-		{
-			$zutrittskarte_ausgegebenam = (new DateTime($zutrittskarte_ausgegebenam))->format('d.m.Y');
-		}
+		$zutrittskarte_ausgegebenam = str_replace("-", ".", $zutrittskarte_ausgegebenam);
 		return $zutrittskarte_ausgegebenam;
 	}
 
@@ -199,7 +196,7 @@ class ProfilLib{
 	private function getAdressenInfo($pid)
 	{
 		$this->ci->load->model("person/Adresse_model","AdresseModel");
-		$adresse_res = $this->ci->AdresseModel->addSelect(["adresse_id", "strasse", "tbl_adressentyp.bezeichnung as typ", "plz", "ort", "heimatadresse", "zustelladresse", "gemeinde", "nation"]);
+		$adresse_res = $this->ci->AdresseModel->addSelect(["adresse_id", "strasse", "tbl_adressentyp.bezeichnung as typ", "plz", "ort", "zustelladresse", "gemeinde", "nation"]);
 		$adresse_res = $this->ci->AdresseModel->addOrder("zustelladresse", "DESC");
 		$adresse_res = $this->ci->AdresseModel->addJoin("tbl_adressentyp", "typ=adressentyp_kurzbz");
 

application/libraries/StundenplanLib.php

@@ -229,10 +229,9 @@ class StundenplanLib
 		$this->_ci->load->model('ressource/Stundenplan_model', 'StundenplanModel');
 
 		$is_mitarbeiter = getData($this->_ci->MitarbeiterModel->isMitarbeiter(getAuthUID()));
-
-		if ($is_mitarbeiter && empty($ort_kurzbz)) {
-			// request for personal lvplan show only reservations of logged in user
-			$reservierungen = $this->_ci->ReservierungModel->getReservierungenMitarbeiter($start_date, $end_date);
+		
+		if ($is_mitarbeiter) {
+			$reservierungen = $this->_ci->ReservierungModel->getReservierungenMitarbeiter($start_date, $end_date, $ort_kurzbz);
 		} else {
 			// querying the reservierungen
 			$reservierungen = $this->_ci->ReservierungModel->getReservierungen($start_date, $end_date, $ort_kurzbz);

application/models/accounting/Vertrag_model.php

@@ -402,26 +402,6 @@ class Vertrag_model extends DB_Model
 		return $this->loadWhere(array('mitarbeiter_uid' => $mitarbeiter_uid, 'lehreinheit_id' => $lehreinheit_id));
 	}
 
-	public function getVertragById($vertrag_id)
-	{
-		$this->addSelect(
-			'tbl_vertrag.vertrag_id, vertragstyp_kurzbz, vertragsstunden, vertragsstunden_studiensemester_kurzbz, status.vertragsstatus_kurzbz,
-			status.bezeichnung AS vertragsstatus, tbl_vertrag.betrag, lema.semesterstunden, lema.stundensatz'
-		);
-		$this->addJoin('lehre.tbl_lehreinheitmitarbeiter lema', 'tbl_vertrag.vertrag_id = lema.vertrag_id', 'LEFT');
-		$this->addJoin('
-			(
-				SELECT DISTINCT ON(vst.vertrag_id) vst.vertrag_id,
-					bezeichnung,
-					tbl_vertragsstatus.vertragsstatus_kurzbz
-				FROM lehre.tbl_vertrag_vertragsstatus vst
-					JOIN lehre.tbl_vertragsstatus USING(vertragsstatus_kurzbz)
-				ORDER BY vst.vertrag_id, datum DESC
-			) as status', 'status.vertrag_id = lehre.tbl_vertrag.vertrag_id', 'LEFT');
-
-		return $this->loadWhere(['tbl_vertrag.vertrag_id' => $vertrag_id]);
-	}
-
 	public function cancelVertrag($vertrag_id, $mitarbeiter_uid)
 	{
 		$vertrag = $this->load($vertrag_id);

application/models/crm/Prestudent_model.php

@@ -1,7 +1,5 @@
 <?php
 
-use CI3_Events as Events;
-
 class Prestudent_model extends DB_Model
 {
 	/**
@@ -784,118 +782,4 @@ class Prestudent_model extends DB_Model
 
 		return $this->execQuery($query, array($person_id));
 	}
-
-	/**
-	 * Adds a filter to the query builder
-	 *
-	 * @param array			$filter
-	 * @return boolean
-	 */
-	public function addFilter($filter)
-	{
-		if (!isset($filter['type']))
-			return false;
-
-		switch ($filter['type']) {
-			case 'konto':
-				$bt = '';
-				$stdsem = '';
-				$comp = '!=';
-
-				if (isset($filter['buchungstyp_kurzbz']) && $filter['buchungstyp_kurzbz'] != 'all')
-					$bt = ' AND buchungstyp_kurzbz=' . $this->escape($filter['buchungstyp_kurzbz']);
-				
-				if (isset($filter['studiensemester_kurzbz']))
-					$stdsem = ' AND studiensemester_kurzbz=' . $this->escape($filter['studiensemester_kurzbz']);
-
-				if (isset($filter['missing']) && $filter['missing']) {
-					$comp = '=';
-					$this->db->where('get_rolle_prestudent(tbl_prestudent.prestudent_id, NULL) !=', 'Incoming');
-				}
-
-				$this->db->where('(
-					SELECT count(*) 
-					FROM public.tbl_konto 
-					WHERE person_id=tbl_prestudent.person_id 
-					' . $bt . ' 
-					' . $stdsem . '
-				) ' . $comp, 0);
-				break;
-			
-			case 'konto_counter':
-				$bt = '';
-				$samestg = '';
-				$past = '';
-
-				if (isset($filter['buchungstyp_kurzbz']) && $filter['buchungstyp_kurzbz'] != 'all')
-					$bt = ' AND buchungstyp_kurzbz = ' . $this->escape($filter['buchungstyp_kurzbz']);
-				
-				if (isset($filter['samestg']) && $filter['samestg'])
-					$samestg = ' AND studiengang_kz = tbl_prestudent.studiengang_kz';
-
-				if (isset($filter['past']) && $filter['past'])
-					$past = ' AND buchungsdatum < NOW()';
-
-				$this->db->where('(
-					SELECT sum(betrag) 
-					FROM public.tbl_konto 
-					WHERE person_id = tbl_prestudent.person_id 
-					' . $bt . ' 
-					' . $samestg . '
-					' . $past . '
-				) !=', 0);
-				break;
-			
-			case 'zgv':
-				$this->db
-					->group_start()
-						->group_start()
-							->where('zgv_code IS NOT NULL')
-							->where('zgvdatum IS NULL')
-						->group_end()
-						->or_group_start()
-							->where('zgvmas_code IS NOT NULL')
-							->where('zgvmadatum IS NULL')
-						->group_end()
-						->or_group_start()
-							->where('zgvdoktor_code IS NOT NULL')
-							->where('zgvdoktordatum IS NULL')
-						->group_end()
-					->group_end();
-				break;
-			
-			case 'documents':
-				$this->db->where('(
-					SELECT count(*) 
-					FROM public.tbl_dokumentstudiengang 
-					WHERE dokument_kurzbz NOT IN (
-						SELECT dokument_kurzbz 
-						FROM tbl_dokumentprestudent 
-						WHERE prestudent_id=tbl_prestudent.prestudent_id
-					)
-					AND studiengang_kz=tbl_prestudent.studiengang_kz
-				) !=', 0);
-				break;
-
-			case 'statusgrund':
-				if (!isset($filter['statusgrund_id']))
-					return false;
-
-				if (isset($filter['studiensemester_kurzbz']))
-					$stdsem = ' AND studiensemester_kurzbz=' . $this->escape($filter['studiensemester_kurzbz']);
-
-				$this->db->where('(
-					SELECT count(*) 
-					FROM public.tbl_prestudentstatus 
-					WHERE prestudent_id = tbl_prestudent.prestudent_id 
-					AND statusgrund_id = ' . $this->escape($filter['statusgrund_id']) . '
-					' . $stdsem . '
-				) !=', 0);
-				break;
-		}
-
-		Events::trigger('prestudent_add_filter', $filter);
-
-		return true;
-	}
 }

application/models/crm/Prestudentstatus_model.php

@@ -290,11 +290,7 @@ class Prestudentstatus_model extends DB_Model
 	 */
 	public function getLastStatusPerson($person_id, $studiensemester_kurzbz = null)
 	{
-		$query = 'SELECT p.*, ps.*, s.*,
-					stg.kurzbz AS studiengang_kurzbz, stg.kurzbzlang AS studiengang_kurzbzlang,
-					UPPER(typ::varchar(1) || kurzbz) AS studiengang_kuerzel,
-					stg.typ AS studiengang_typ, stg.bezeichnung AS studiengang_bezeichnung, stg.english AS studiengang_bezeichnung_english,
-					stg.orgform_kurzbz AS studiengang_orgform
+		$query = 'SELECT *
 					FROM public.tbl_prestudent p
 					JOIN (
 							SELECT DISTINCT ON(prestudent_id) *
@@ -302,8 +298,7 @@ class Prestudentstatus_model extends DB_Model
 							 WHERE prestudent_id IN (SELECT prestudent_id FROM public.tbl_prestudent WHERE person_id = ?)
 						  ORDER BY prestudent_id, datum desc, insertamum desc
 						) ps USING(prestudent_id)
-					JOIN public.tbl_status s USING(status_kurzbz)
-					JOIN public.tbl_studiengang stg USING (studiengang_kz)';
+					JOIN public.tbl_status USING(status_kurzbz)';
 
 		$parametersArray = array($person_id);
 

application/models/crm/Student_model.php

@@ -27,7 +27,7 @@ class Student_model extends DB_Model
         $this->addSelect('1');
 
         $result = $this->loadWhere(array('student_uid' => $uid));
-
+        
 
         if(hasData($result))
         {
@@ -169,7 +169,7 @@ class Student_model extends DB_Model
 
 		$max = 0;
 		if ($matrikelnrres && hasData($matrikelnrres)) {
-			$max = mb_substr(trim(getData($matrikelnrres)[0]->matrikelnr), -3);
+			$max = mb_substr($matrikelnrres->retval[0]->matrikelnr, 7);
 			if (!is_numeric($max)) {
 				$max = (int)$max;
 			}

application/models/education/Lehreinheit_model.php

@@ -651,13 +651,7 @@ EOSQL;
 											 ELSE NULL
 											 END
 									 END,
-								 ' ' 
-									ORDER BY
-										UPPER(tbl_studiengang.typ::varchar(1) || tbl_studiengang.kurzbz),
-										COALESCE(TRIM(tbl_lehreinheitgruppe.semester::text), ''),
-										COALESCE(TRIM(tbl_lehreinheitgruppe.verband), ''),
-										COALESCE(TRIM(tbl_lehreinheitgruppe.gruppe), ''),
-										COALESCE(tbl_lehreinheitgruppe.gruppe_kurzbz, '')
+								 ' '
 						 ) AS gruppen
 					 FROM lehre.tbl_lehreinheitgruppe
 						LEFT JOIN public.tbl_studiengang USING (studiengang_kz)

application/models/education/Lehreinheitgruppe_model.php

@@ -374,7 +374,7 @@ class Lehreinheitgruppe_model extends DB_Model
 			return success('Group assigned successfully to Lehreinheit');
 		}
 		else
-			return error($this->p->t('lehre', 'grpbereitszugeteilt'));
+			return error('Group already assigned');
 	}
 
 	public function deleteGroup($lehreinheit_id, $lehreinheitgruppe_id)
@@ -401,7 +401,7 @@ class Lehreinheitgruppe_model extends DB_Model
 		$stundenplan_result = $this->loadWhere(array('tbl_lehreinheitgruppe.lehreinheitgruppe_id' => $lehreinheitgruppe_id));
 
 		if (hasData($stundenplan_result))
-			return error($this->p->t('lehre', 'grpbereitsverplant'));
+			return error('Gruppe already verplant');
 
 		$delete_result = $this->delete($lehreinheitgruppe_id);
 

application/models/education/Lehrveranstaltung_model.php

@@ -316,8 +316,8 @@ class Lehrveranstaltung_model extends DB_Model
 			(SELECT status_kurzbz FROM public.tbl_prestudentstatus WHERE prestudent_id=tbl_student.prestudent_id ORDER BY datum DESC, insertamum DESC, ext_id DESC LIMIT 1) as status,
 			tbl_bisio.bisio_id, tbl_bisio.von, tbl_bisio.bis, tbl_student.studiengang_kz AS stg_kz_student,
 			tbl_zeugnisnote.note, tbl_mitarbeiter.mitarbeiter_uid, tbl_person.matr_nr, tbl_benutzer.uid,
-			UPPER(tbl_studiengang.typ::varchar(1) || tbl_studiengang.kurzbz) as kuerzel, tbl_studiengang.orgform_kurzbz, vw_student_lehrveranstaltung.semester, vw_student_lehrveranstaltung.studiensemester_kurzbz, vw_student_lehrveranstaltung.bezeichnung,
-			tbl_student.prestudent_id
+			UPPER(tbl_studiengang.typ::varchar(1) || tbl_studiengang.kurzbz) as kuerzel, tbl_studiengang.orgform_kurzbz, vw_student_lehrveranstaltung.semester, vw_student_lehrveranstaltung.studiensemester_kurzbz, vw_student_lehrveranstaltung.bezeichnung
+
 		FROM
 			campus.vw_student_lehrveranstaltung
 			JOIN public.tbl_benutzer USING(uid)
@@ -386,37 +386,6 @@ class Lehrveranstaltung_model extends DB_Model
 
 		return $this->execQuery($query, array($lehrveranstaltung_id, $studiensemester_kurzbz));
 	}
-
-	/**
-	 * Get LV-Leitung of given Lehrveranstaltung ID and Studiensemester.
-	 *
-	 * @param $lehrveranstaltung_id
-	 * @param $studiensemester
-	 * @return array|stdClass|null
-	 */
-	public function getLvLeitung($lehrveranstaltung_id, $studiensemester)
-	{
-		$params = [$lehrveranstaltung_id, $studiensemester];
-
-		$qry = "
-			SELECT
-				vorname, nachname, mitarbeiter_uid, lehrfunktion_kurzbz
-			FROM
-				lehre.tbl_lehreinheit
-				JOIN lehre.tbl_lehreinheitmitarbeiter lema USING (lehreinheit_id)
-				JOIN public.tbl_benutzer b ON b.uid = lema.mitarbeiter_uid
-				JOIN public.tbl_person p using (person_id) 
-			WHERE
-				tbl_lehreinheit.lehrveranstaltung_id= ?
-				AND tbl_lehreinheit.studiensemester_kurzbz = ?
-				AND lehrfunktion_kurzbz = 'LV-Leitung'
-            ORDER BY 
-                lema.insertamum DESC
-			LIMIT 1
-		";
-
-		return $this->execQuery($qry, $params);
-	}
 	/**
 	 * Gets all Leiter of Lehrveranstaltungsorganisationseinheit
 	 * @param $lehrveranstaltung_id
@@ -1286,61 +1255,4 @@ class Lehrveranstaltung_model extends DB_Model
 
 		return $this->execReadOnlyQuery($qry, $params);
 	}
-
-	/**
-	 * Gets Lehrveranstaltungen for a student, as needed for a Projektarbeit.
-	 * @param student_uid
-	 * @param studiengang_kz optional, all Lvs of this Studiengang will be included 
-	 * @param additional_lehrveranstaltung_id optional, this lv will be added to result
-	 * @return object success or error
-	 */
-	public function getLvsForProjektarbeit($student_uid, $studiengang_kz = null, $additional_lehrveranstaltung_id = null)
-	{
-		$params = array($student_uid, $student_uid);
-
-		$qry = "
-			SELECT *
-			FROM
-				lehre.tbl_lehrveranstaltung
-			WHERE
-				(
-					lehrveranstaltung_id IN (
-
-						SELECT
-							lehrveranstaltung_id
-						FROM
-							campus.vw_student_lehrveranstaltung
-						WHERE
-							uid=?
-
-						UNION
-
-						SELECT
-							lehrveranstaltung_id
-						FROM
-							lehre.tbl_zeugnisnote
-						WHERE
-							student_uid=?
-					)";
-
-		if (isset($studiengang_kz))
-		{
-			$params[] = $studiengang_kz;
-			$qry .= " OR (studiengang_kz = ? AND semester IS NOT NULL)";
-		}
-
-		if (isset($additional_lehrveranstaltung_id))
-		{
-			$params[] = $additional_lehrveranstaltung_id;
-			$qry .= " OR lehrveranstaltung_id = ?";
-		}
-
-		$qry .= "
-				)
-				AND projektarbeit = TRUE
-			ORDER BY
-				semester, bezeichnung";
-
-		return $this->execQuery($qry, $params);
-	}
 }

application/models/education/Projektarbeit_model.php

@@ -24,28 +24,16 @@ class Projektarbeit_model extends DB_Model
 	public function getProjektarbeit($student_uid, $studiengang_kz = null, $studiensemester_kurzbz = null, $projekttyp = null, $final = null)
 	{
 		$qry = "SELECT
-					pa.*, tbl_projekttyp.bezeichnung,
-					tbl_lehreinheit.studiensemester_kurzbz, tbl_lehrveranstaltung.lehrveranstaltung_id,
-					tbl_firma.name AS firma_name,
-					(
-						SELECT
-							STRING_AGG(trim(COALESCE(titelpre,'')||' '||COALESCE(vorname,'')||' '||COALESCE(nachname,'')||' '||COALESCE(titelpost,'')), ', ')
-						FROM
-							lehre.tbl_projektbetreuer
-							JOIN public.tbl_person USING (person_id)
-						WHERE
-							projektarbeit_id = pa.projektarbeit_id
-							AND student_uid = pa.student_uid
-						GROUP BY projektarbeit_id
-					) AS projektbetreuer
+					tbl_projektarbeit.* , tbl_projekttyp.bezeichnung
 				FROM
-					lehre.tbl_projektarbeit pa
-					JOIN lehre.tbl_projekttyp USING (projekttyp_kurzbz)
-					JOIN lehre.tbl_lehreinheit USING (lehreinheit_id)
-					JOIN lehre.tbl_lehrveranstaltung USING (lehrveranstaltung_id)
-					LEFT JOIN public.tbl_firma USING (firma_id)
+					lehre.tbl_projektarbeit
+				JOIN
+					lehre.tbl_projekttyp USING (projekttyp_kurzbz), lehre.tbl_lehreinheit, lehre.tbl_lehrveranstaltung
+
 				WHERE
-					pa.student_uid = ?";
+					tbl_projektarbeit.lehreinheit_id=tbl_lehreinheit.lehreinheit_id AND
+					tbl_lehreinheit.lehrveranstaltung_id = tbl_lehrveranstaltung.lehrveranstaltung_id AND
+					tbl_projektarbeit.student_uid = ?";
 
 		$params = array($student_uid);
 
@@ -64,16 +52,16 @@ class Projektarbeit_model extends DB_Model
 		if (isset($projekttyp))
 		{
 			if (is_array($projekttyp))
-				$qry .= ' AND pa.projekttyp_kurzbz IN ?';
+				$qry .= ' AND tbl_projektarbeit.projekttyp_kurzbz IN ?';
 			else
-				$qry .= ' AND pa.projekttyp_kurzbz=?';
+				$qry .= ' AND tbl_projektarbeit.projekttyp_kurzbz=?';
 
 			$params[] = $projekttyp;
 		}
 
 		if (isset($final))
 		{
-			$qry .= ' AND pa.final=?';
+			$qry .= ' AND tbl_projektarbeit.final=?';
 			$params[] = $final;
 		}
 
@@ -273,30 +261,4 @@ class Projektarbeit_model extends DB_Model
 		
 		return $this->execReadOnlyQuery($qry, array($projektarbeit_id));
 	}
-
-	/**
-	 *
-	 * @param
-	 * @return object success or error
-	 */
-	public function hasBerechtigungForProjektarbeit($projektarbeit_id)
-	{
-		if (!$projektarbeit_id || !is_numeric($projektarbeit_id))
-			return false;
-
-		$this->ProjektarbeitModel->addSelect('studiengang_kz');
-		$this->ProjektarbeitModel->addJoin('public.tbl_student', 'student_uid');
-		$result = $this->ProjektarbeitModel->load($projektarbeit_id);
-		if (isError($result) || !hasData($result))
-			return false;
-
-		$studiengang_kz = getData($result)[0]->studiengang_kz;
-
-		if ($this->permissionlib->isBerechtigt('admin', 'suid', $studiengang_kz))
-			return true;
-		if ($this->permissionlib->isBerechtigt('assistenz', 'suid', $studiengang_kz))
-			return true;
-
-		return false;
-	}
 }

application/models/education/Projektbetreuer_model.php

@@ -10,7 +10,6 @@ class Projektbetreuer_model extends DB_Model
 		parent::__construct();
 		$this->dbTable = 'lehre.tbl_projektbetreuer';
 		$this->pk = array('betreuerart_kurzbz', 'projektarbeit_id', 'person_id');
-		$this->hasSequence = false;
 	}
 
     /**

application/models/organisation/Studiengang_model.php

@@ -801,73 +801,4 @@ class Studiengang_model extends DB_Model
 
 		return $this->execReadOnlyQuery($qry, array($studiengang_kz, $orgform_kurzbz, $studiensemester_kurzbz));
 	}
-
-	/**
-	 * Get active Studiengänge with Kuerzel by given Studiengang-Kennzahlen.
-	 * Helpful to easily get Studiengänge the user is entitled for.
-	 *
-	 * @param $studiengang_kz_arr
-	 * @param $studiensemester_kurzbz
-	 * @return array|stdClass|null	Returns one row per Studiengang. Not considering the Orgforms.
-	 */
-	public function getByStgs($studiengang_kz_arr, $studiensemester_kurzbz)
-	{
-		if (is_numeric($studiengang_kz_arr))
-		{
-			$studiengang_kz_arr = [$studiengang_kz_arr];
-		}
-
-		$qry = '
-			SELECT
-				DISTINCT stg.*, UPPER(typ::varchar(1) || kurzbz) AS kuerzel
-			FROM
-				public.tbl_studiengang stg
-				JOIN lehre.tbl_studienordnung sto USING(studiengang_kz)
-				JOIN lehre.tbl_studienplan stpl USING(studienordnung_id)
-				JOIN lehre.tbl_studienplan_semester stplsem USING(studienplan_id)
-			WHERE
-				stg.studiengang_kz IN ?
-				AND stplsem.studiensemester_kurzbz = ?
-			ORDER BY
-				stg.kurzbzlang
-		';
-
-		return $this->execQuery($qry, [$studiengang_kz_arr, $studiensemester_kurzbz]);
-	}
-
-	/**
-	 * Get OrgForms of given Studiengang and Studiensemester.
-	 *
-	 * @param $studiengang_kz
-	 * @param $studiensemester_kurzbz
-	 * @return array|stdClass|null
-	 */
-	public function getOrgformsByStg($studiengang_kz, $studiensemester_kurzbz)
-	{
-		$qry = '
-			SELECT
-				stpl.orgform_kurzbz
-			FROM
-				public.tbl_studiengang stg
-				JOIN lehre.tbl_studienordnung sto USING(studiengang_kz)
-				JOIN lehre.tbl_studienplan stpl USING(studienordnung_id)
-				JOIN lehre.tbl_studienplan_semester stplsem USING(studienplan_id)
-			WHERE
-				stg.studiengang_kz = ?
-				AND stg.aktiv = TRUE
-				AND stplsem.studiensemester_kurzbz = ?
-			GROUP BY
-				stpl.orgform_kurzbz
-			ORDER BY
-				CASE stpl.orgform_kurzbz
-					WHEN \'VZ\' THEN 1
-					WHEN \'BB\' THEN 2
-					WHEN \'DUA\' THEN 3
-					ELSE 4
-				END,
-				stpl.orgform_kurzbz; 
-		';
-
-		return $this->execQuery($qry, [$studiengang_kz, $studiensemester_kurzbz]);
-	}
 }

application/models/organisation/Studienplan_model.php

@@ -157,6 +157,7 @@ class Studienplan_model extends DB_Model
 		return $this->execReadOnlyQuery($qry, array($lv_id));
 	}
 
+
 	public function getStudienplaeneForPerson($person_id)
 	{
 		$this->addDistinct();

application/models/person/Kontaktverifikation_model.php

@@ -1,42 +0,0 @@
-<?php
-class Kontaktverifikation_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'public.tbl_kontakt_verifikation';
-		$this->pk = 'kontakt_verifikation_id';
-	}
-
-	/**
-	 * Gets contact verification for a person and a verification code
-	 * @param person_id
-	 * @param kontakttyp
-	 * @param verifikation_code
-	 * @param expiration_days number of days after which verifikation code expires
-	 * @return object success or error
-	 */
-	public function getKontaktVerifikation($person_id, $kontakttyp, $verifikation_code, $expiration_days = 1)
-	{
-		$qry = "
-			SELECT
-				kt.kontakt_id,
-				kv.verifikation_code
-			FROM
-				public.tbl_kontakt_verifikation kv
-				JOIN public.tbl_kontakt kt USING(kontakt_id)
-			WHERE kt.person_id = ?
-				AND kt.kontakttyp = ?
-				AND kv.verifikation_code = ?
-				AND kv.erstelldatum >= NOW() - INTERVAL '".$this->escape($expiration_days)." days'
-			ORDER BY
-				kt.kontakt_id DESC
-			LIMIT 1";
-
-		return $this->execQuery($qry, array($person_id, $kontakttyp, $verifikation_code));
-	}
-}

application/models/person/Notiz_model.php

@@ -207,6 +207,7 @@ class Notiz_model extends DB_Model
 			";
 
 		return $this->execQuery($qry, array($type, $id));
+
 	}
 
 

application/models/person/Person_model.php

@@ -151,21 +151,12 @@ class Person_model extends DB_Model
 	 */
 	public function searchPerson($filter)
 	{
-		$this->addSelect('vorname, nachname, gebdatum, person_id, titelpre, titelpost');
-		$this->addSelect("CASE
-				WHEN EXISTS
-					(SELECT 1 FROM public.tbl_benutzer JOIN public.tbl_mitarbeiter ON(uid=mitarbeiter_uid) WHERE person_id=tbl_person.person_id)
-				THEN 'Mitarbeiter'
-				WHEN EXISTS
-					(SELECT 1 FROM public.tbl_benutzer JOIN public.tbl_student ON(uid=student_uid) WHERE person_id=tbl_person.person_id)
-				THEN 'Student'
-				ELSE 'Person'
-			END AS status");
+		$this->addSelect('vorname, nachname, gebdatum, person_id');
 		$result = $this->loadWhere(
-			'lower(nachname) like '.$this->db->escape('%'.mb_strtolower($filter).'%')."
+			'lower(nachname) like '.$this->db->escape('%'.$filter.'%')."
 			OR lower(vorname) like ".$this->db->escape('%'.$filter.'%')."
-			OR lower(nachname || ' ' || vorname) like ".$this->db->escape('%'.mb_strtolower($filter).'%')."
-			OR lower(vorname || ' ' || nachname) like ".$this->db->escape('%'.mb_strtolower($filter).'%')
+			OR lower(nachname || ' ' || vorname) like ".$this->db->escape('%'.$filter.'%')."
+			OR lower(vorname || ' ' || nachname) like ".$this->db->escape('%'.$filter.'%')
 		);
 
 		return $result;
@@ -420,4 +411,4 @@ class Person_model extends DB_Model
 			return success($result);
 		}
 	}
-}
+}

application/models/person/Profil_update_model.php

@@ -63,7 +63,6 @@ class Profil_update_model extends DB_Model
 		$this->addSelect(["public.tbl_profil_update.*", "public.tbl_person.vorname"]);
 		$this->addJoin("public.tbl_benutzer", "public.tbl_benutzer.uid = public.tbl_profil_update.uid");
 		$this->addJoin("public.tbl_person", "public.tbl_person.person_id = public.tbl_benutzer.person_id");
-		$this->db->order_by('COALESCE(public.tbl_profil_update.updateamum, public.tbl_profil_update.insertamum)', 'DESC', false);
 		$res = $this->loadWhere($whereClause);
 		if (isError($res)) {
 			return $res;
@@ -119,48 +118,13 @@ class Profil_update_model extends DB_Model
 			$parameters = [];
 			$query = "
 			SELECT
-				profil_update_id,
-				tbl_profil_update.uid,
-				(tbl_person.vorname || ' ' || tbl_person.nachname) AS name ,
-				topic,
-				requested_change,
-				tbl_profil_update.updateamum,
-				tbl_profil_update.updatevon,
-				tbl_profil_update.insertamum,
-				tbl_profil_update.insertvon,
-				status,
-				public.tbl_profil_update_status.bezeichnung_mehrsprachig[(" . $lang . ")] as status_translated,
-				status_timestamp,
-				status_message,
-				attachment_id,
-				UPPER(public.tbl_studiengang.typ || public.tbl_studiengang.kurzbz) AS studiengang,
-				COALESCE(of.orgform_kurzbz, public.tbl_studiengang.orgform_kurzbz) AS orgform,
-				NULL as oezuordnung,
-				tbl_student.semester
+			profil_update_id, tbl_profil_update.uid, (tbl_person.vorname || ' ' || tbl_person.nachname) AS name , topic, requested_change, tbl_profil_update.updateamum, tbl_profil_update.updatevon, tbl_profil_update.insertamum, tbl_profil_update.insertvon, status, public.tbl_profil_update_status.bezeichnung_mehrsprachig[(" . $lang . ")] as status_translated, status_timestamp, status_message, attachment_id 
 			FROM public.tbl_profil_update
 			JOIN public.tbl_profil_update_status ON public.tbl_profil_update_status.status_kurzbz = public.tbl_profil_update.status 
 			JOIN public.tbl_student ON public.tbl_student.student_uid=public.tbl_profil_update.uid
 			JOIN public.tbl_benutzer ON public.tbl_benutzer.uid = public.tbl_student.student_uid
 			JOIN public.tbl_person ON public.tbl_benutzer.person_id=public.tbl_person.person_id
 			JOIN public.tbl_studiengang ON public.tbl_studiengang.studiengang_kz=public.tbl_student.studiengang_kz
-			LEFT JOIN (
-				select
-					pss.prestudent_id, COALESCE(sp.orgform_kurzbz, pss.orgform_kurzbz) as orgform_kurzbz
-				from (
-					select
-						prestudent_id, max(insertamum) as insertamum
-					from
-						public.tbl_prestudentstatus
-					where
-						datum <= NOW()
-					group by
-						prestudent_id
-				) mpss
-				join
-					public.tbl_prestudentstatus pss on pss.prestudent_id  = mpss.prestudent_id and pss.insertamum = mpss.insertamum
-				left join
-					lehre.tbl_studienplan sp on pss.studienplan_id = sp.studienplan_id
-			) of ON of.prestudent_id = public.tbl_student.prestudent_id
 			Where public.tbl_studiengang.oe_kurzbz IN ? ";
 			$parameters[] = $oe_berechtigung;
 			if ($whereClause) {
@@ -180,33 +144,12 @@ class Profil_update_model extends DB_Model
 			}
 		}
 		if ($mitarbeiterBerechtigung) {
-			$this->addSelect([
-				"profil_update_id",
-				"tbl_profil_update.uid",
-				"(tbl_person.vorname || ' ' || tbl_person.nachname) AS name",
-				"topic",
-				"requested_change",
-				"tbl_profil_update.updateamum",
-				"tbl_profil_update.updatevon",
-				"tbl_profil_update.insertamum",
-				"tbl_profil_update.insertvon",
-				"status",
-				"public.tbl_profil_update_status.bezeichnung_mehrsprachig[(" . $lang . ")] AS status_translated",
-				"status_timestamp",
-				"status_message",
-				"attachment_id",
-				"COALESCE(NULL) as studiengang",
-				"COALESCE(NULL) as orgform",
-				"oe.bezeichnung as oezuordnung"
-			]);
+			$this->addSelect(["profil_update_id", "tbl_profil_update.uid", "(tbl_person.vorname || ' ' || tbl_person.nachname) AS name", "topic", "requested_change", "tbl_profil_update.updateamum", "tbl_profil_update.updatevon", "tbl_profil_update.insertamum", "tbl_profil_update.insertvon", "status", "public.tbl_profil_update_status.bezeichnung_mehrsprachig[(" . $lang . ")] AS status_translated", "status_timestamp", "status_message", "attachment_id"]);
 			$this->addJoin('tbl_profil_update_status', 'tbl_profil_update_status.status_kurzbz=tbl_profil_update.status');
 			$this->addJoin('tbl_mitarbeiter', 'tbl_mitarbeiter.mitarbeiter_uid=tbl_profil_update.uid');
 			$this->addJoin('tbl_benutzer', 'tbl_benutzer.uid=tbl_profil_update.uid');
 			$this->addJoin('tbl_person', 'tbl_benutzer.person_id=tbl_person.person_id');
-			$this->addJoin('tbl_benutzerfunktion bf', 'bf.uid = tbl_benutzer.uid AND bf.funktion_kurzbz = \'oezuordnung\' AND NOW() >= COALESCE(bf.datum_von, \'1970-01-01\'::date) AND NOW() <= COALESCE(bf.datum_bis, \'2170-12-31\'::date)', 'LEFT');
-			$this->addJoin('tbl_organisationseinheit oe', 'oe.oe_kurzbz = bf.oe_kurzbz', 'LEFT');
 			$mitarbeiterRequests = $this->loadWhere($whereClause);
-
 			if (isError($mitarbeiterRequests))
 				return error("db error: " . getData($mitarbeiterRequests));
 			$mitarbeiterRequests = getData($mitarbeiterRequests) ?: [];
@@ -236,11 +179,8 @@ class Profil_update_model extends DB_Model
 	private function formatProfilRequest($request)
 	{
 		$request->requested_change = json_decode($request->requested_change);
-		$request->insertamum_iso = !is_null($request->insertamum) ? date_create($request->insertamum)->format('Y-m-d') : null;
 		$request->insertamum = !is_null($request->insertamum) ? date_create($request->insertamum)->format('d.m.Y') : null;
-		$request->updateamum_iso = !is_null($request->updateamum) ? date_create($request->updateamum)->format('Y-m-d') : null;
 		$request->updateamum = !is_null($request->updateamum) ? date_create($request->updateamum)->format('d.m.Y') : null;
-		$request->status_timestamp_iso = !is_null($request->status_timestamp) ? date_create($request->status_timestamp)->format('Y-m-d') : null;
 		$request->status_timestamp = !is_null($request->status_timestamp) ? date_create($request->status_timestamp)->format('d.m.Y') : null;
 	}
 

application/models/ressource/Firma_model.php

@@ -12,24 +12,17 @@ class Firma_model extends DB_Model
 		$this->pk = 'firma_id';
 	}
 
-	public function searchFirmen($filter, $aktiv = null)
+	public function searchFirmen($filter)
 	{
-		$params = [];
 		$filter = strtoLower($filter);
 		$qry = "
-			SELECT
+			SELECT 
 				f.name, f.firma_id
-			FROM
-				public.tbl_firma f
-			WHERE
-				lower (f.name) LIKE '%". $this->db->escape_like_str($filter)."%'";
+			FROM 
+			    public.tbl_firma f
+			WHERE 
+			    lower (f.name) LIKE '%". $this->db->escape_like_str($filter)."%'";
 
-			if (isset($aktiv) && is_bool($aktiv))
-			{
-				$params[] = $aktiv;
-				$qry .= " AND aktiv = ?";
-			}
-
-		return $this->execQuery($qry, $params);
+		return $this->execQuery($qry);
 	}
 }

application/models/ressource/Mitarbeiter_model.php

@@ -353,14 +353,12 @@ class Mitarbeiter_model extends DB_Model
 	{
 		$filter = strtoLower($filter);
 
-		$returnwert = "p.person_id, p.nachname, p.vorname, p.titelpost,  p.titelpre";
-
 		if ($mode == "mitAkadGrad")
-			$returnwert .= ", ma.mitarbeiter_uid, CONCAT(p.nachname, ' ', p.vorname, ' ', p.titelpost, ' ', p.titelpre, ' (', ma.mitarbeiter_uid , ')') as mitarbeiter";
+			$returnwert = "ma.mitarbeiter_uid, CONCAT(p.nachname, ' ', p.vorname, ' ', p.titelpost, ' ', p.titelpre, ' (', ma.mitarbeiter_uid , ')') as mitarbeiter";
 		elseif ($mode == "ohneMaUid")
-			$returnwert .= ", CONCAT(p.nachname, ' ', p.vorname, ' ', p.titelpost, ' ', p.titelpre) as mitarbeiter";
+			$returnwert = "p.person_id, CONCAT(p.nachname, ' ', p.vorname, ' ', p.titelpost, ' ', p.titelpre) as mitarbeiter";
 		else
-			$returnwert .= ", ma.mitarbeiter_uid, CONCAT(p.nachname, ' ', p.vorname, ' (', ma.mitarbeiter_uid , ')') as mitarbeiter";
+			$returnwert = "ma.mitarbeiter_uid, CONCAT(p.nachname, ' ', p.vorname, ' (', ma.mitarbeiter_uid , ')') as mitarbeiter";
 
 		$qry = "
 			SELECT " . $returnwert . "  
@@ -375,11 +373,7 @@ class Mitarbeiter_model extends DB_Model
 			OR
 				lower (p.vorname) LIKE '%". $this->db->escape_like_str($filter)."%'
 			OR
-				(ma.mitarbeiter_uid) LIKE '%". $this->db->escape_like_str($filter)."%'
-			OR
-				lower(vorname || ' ' || nachname || ' ' || vorname) like ".$this->db->escape('%'.mb_strtolower($filter).'%')."
-			ORDER BY
-				p.nachname, p.vorname, b.uid, p.person_id";
+				(ma.mitarbeiter_uid) LIKE '%". $this->db->escape_like_str($filter)."%'";
 
 		return $this->execQuery($qry);
 	}

application/models/ressource/Reservierung_model.php

@@ -76,7 +76,7 @@ class Reservierung_model extends DB_Model
 	 *
 	 * @return stdClass
 	 */
-	public function getReservierungenMitarbeiter($start_date, $end_date)
+	public function getReservierungenMitarbeiter($start_date, $end_date, $ort_kurzbz = null)
 	{
 
 		$raum_reservierungen_query = "SELECT res.*, beginn, ende,
@@ -89,6 +89,7 @@ class Reservierung_model extends DB_Model
 			JOIN lehre.tbl_stunde ON lehre.tbl_stunde.stunde = res.stunde
 			WHERE res.uid = ? AND datum >= ? AND datum <= ?";
 
+//		$subquery = is_null($ort_kurzbz)? $lvplan_reservierungen_query:$raum_reservierungen_query;
 		$subquery = $raum_reservierungen_query;
 
 		

application/models/ressource/Stundenplan_model.php

@@ -535,53 +535,4 @@ class Stundenplan_model extends DB_Model
 
 		return $this->execQuery($query, [$uid, $uid]);
 	}
-
-	/**
-	 * Get Stundenplantermine for given Lehreinheit.
-	 *
-	 * @param $lehreinheit_id
-	 * @return array|stdClass|null
-	 */
-	public function getTermineByLe($lehreinheit_id)
-	{
-		$qry = '
-			SELECT DISTINCT
-			    datum
-			FROM 
-		       	lehre.vw_stundenplan
-			WHERE 
-				lehreinheit_id = ?
-			ORDER BY 
-			    datum ASC
-		';
-
-		return $this->execQuery($qry, [$lehreinheit_id]);
-	}
-
-	/**
-	 * Get Stundenplantermine for given Lehrveranstaltung of given Studiensemester.
-	 *
-	 * @param $lehrveranstaltung_id
-	 * @param $studiensemester_kurzbz
-	 * @return array|stdClass|null
-	 */
-	public function getTermineByLv($lehrveranstaltung_id, $studiensemester_kurzbz)
-	{
-		$qry = '
-		  	SELECT DISTINCT
-				datum
-	   		FROM
-	   		    lehre.vw_stundenplan
-	  		WHERE 
-	  		    lehreinheit_id IN (
-					SELECT lehreinheit_id
-					FROM lehre.tbl_lehreinheit 
-					WHERE lehrveranstaltung_id = ?
-					AND studiensemester_kurzbz = ?
-				)    
-	   		ORDER BY datum ASC
-		';
-
-		return $this->execQuery($qry, [$lehrveranstaltung_id, $studiensemester_kurzbz]);
-	}
 }

application/models/ressource/Stundensatz_model.php

@@ -2,7 +2,7 @@
 
 class Stundensatz_model extends DB_Model
 {
-
+	
 	/**
 	 * Constructor
 	 */
@@ -43,107 +43,6 @@ class Stundensatz_model extends DB_Model
 		return $this->execQuery($qry, $params);
 	}
 
-	public function getStundensatzForMitarbeiter($person_id, $studiensemester_kurzbz)
-	{
-		$this->load->config('stv');
-
-		$defaultStundensatz = $this->config->item('tabs')['projektarbeit']['defaultProjektbetreuerStundensatz'];
-
-		$stundensatz = '';
-
-		if(isset($person_id) && isset($studiensemester_kurzbz))
-		{
-			$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-
-			$this->StudiensemesterModel->addSelect('start, ende');
-			$result = $this->StudiensemesterModel->load($studiensemester_kurzbz);
-
-			if (hasData($result))
-			{
-				$studiensemester = getData($result)[0];
-
-				if (defined('FAS_LV_LEKTORINNENZUTEILUNG_FIXANGESTELLT_STUNDENSATZ') && !FAS_LV_LEKTORINNENZUTEILUNG_FIXANGESTELLT_STUNDENSATZ)
-				{
-					// load Mitarbeiter
-					$params = [$person_id];
-					$qry = "
-						SELECT
-							mitarbeiter_uid, fixangestellt
-						FROM
-							public.tbl_mitarbeiter
-							JOIN public.tbl_benutzer ON(tbl_benutzer.uid=tbl_mitarbeiter.mitarbeiter_uid)
-						WHERE
-							person_id=?
-						ORDER BY
-							tbl_mitarbeiter.insertamum DESC NULLS LAST
-						LIMIT 1";
-
-					$result = $this->execQuery($qry, $params);
-
-					if (hasData($result))
-					{
-						$ma = getData($result)[0];
-
-						$this->load->model('vertragsbestandteil/Dienstverhaeltnis_model','DienstverhaeltnisModel');
-						$echterdv_result = $this->DienstverhaeltnisModel->existsDienstverhaeltnis(
-							$ma->mitarbeiter_uid,
-							$studiensemester->start,
-							$studiensemester->ende,
-							'echterdv'
-						);
-
-						if (hasData($echterdv_result))
-						{
-							$stundensatz = null;
-						}
-						else
-						{
-							$stundensatzRes = $this->getStundensatzByDatum(
-								$ma->mitarbeiter_uid, $studiensemester->start, $studiensemester->ende, 'lehre'
-							);
-
-							if (hasData($stundensatzRes))
-								$stundensatz = getData($stundensatzRes)[0]->stundensatz;
-							else
-								$stundensatz = '0.00';
-						}
-					}
-					else
-					{
-						$stundensatz = '0.00';
-					}
-
-				}
-				else
-				{
-					$params = [$person_id, $studiensemester->ende, $studiensemester->start];
-					$qry = "SELECT ss.stundensatz
-							FROM hr.tbl_stundensatz ss
-								JOIN public.tbl_mitarbeiter ON ss.uid = tbl_mitarbeiter.mitarbeiter_uid
-								JOIN public.tbl_benutzer ON(tbl_benutzer.uid=tbl_mitarbeiter.mitarbeiter_uid)
-							WHERE person_id=?
-								AND stundensatztyp = 'lehre'
-								AND gueltig_von <= ?
-								AND (gueltig_bis >= ? OR gueltig_bis IS NULL)
-							ORDER BY gueltig_bis DESC NULLS FIRST, gueltig_von DESC NULLS LAST LIMIT 1";
-
-					$result = $this->execQuery($qry, $params);
-
-					if (hasData($result))
-					{
-						$stundensatz = getData($result)[0]->stundensatz;
-					}
-					else
-					{
-						$stundensatz = $defaultStundensatz;
-					}
-				}
-			}
-		}
-
-		return $stundensatz;
-	}
-
 	public function getDefaultStundensatz($mitarbeiter_uid, $beginn, $ende = null, $typ = null)
 	{
 		$stundensatz_result = $this->getStundensatzByDatum($mitarbeiter_uid, $beginn, $ende, $typ);
@@ -159,4 +58,4 @@ class Stundensatz_model extends DB_Model
 		}
 		return $default_stundensatz;
 	}
-}
+}

application/models/vertragsbestandteil/Dienstverhaeltnis_model.php

@@ -254,16 +254,22 @@ EOSQL;
 	return $dvs;
     }
 
-	public function existsDienstverhaeltnis($mitarbeiter_uid, $start, $ende, $vertragsart_kurzbz)
+	public function existsDienstverhaeltnis($mitarbeiter_uid, $start, $ende = null, $vertragsart_kurzbz = null)
 	{
 		$this->addOrder('von', 'DESC');
 		$this->db->where('mitarbeiter_uid', $mitarbeiter_uid);
-		$this->db->where('vertragsart_kurzbz', $vertragsart_kurzbz);
+		if (!is_null($vertragsart_kurzbz))
+			$this->db->where('vertragsart_kurzbz', $this->escape($vertragsart_kurzbz));
+
 		$this->db->where('von <=', $ende);
-		$this->db->group_start();
-		$this->db->where('bis >=', $start);
-		$this->db->or_where('bis IS NULL', null, false);
-		$this->db->group_end();
+
+		if (!is_null($ende))
+		{
+			$this->db->group_start();
+			$this->db->where('bis >=', $start);
+			$this->db->or_where('bis IS NULL', null, false);
+			$this->db->group_end();
+		}
 
 		$this->addLimit(1);
 		return $this->load();

application/views/Cis/ProfilUpdate.php

@@ -2,14 +2,10 @@
 $includesArray = array(
     'title' => 'Profil Änderungen',
     'vue3' => true,
-	'primevue3' => true,
     'bootstrap5' => true,
     'fontawesome6'=> true,
     'axios027' => true,
     'tabulator5' => true,
-	'customJSs' => array(
-		'vendor/moment/luxonjs/luxon.min.js'
-	),
     'customJSModules' => array(
 	'public/js/apps/Cis/ProfilUpdateRequests.js'
     ),

application/views/Nachrichten.php

@@ -40,10 +40,6 @@ $configArray = [
 		cis-root="<?= CIS_ROOT; ?>"
 		:permissions="<?= htmlspecialchars(json_encode($permissions)); ?>"
 		:config="<?=  htmlspecialchars(json_encode($configArray)); ?>"
-<?php if($ids !== null && $typeid !== null) { ?>
-		:id ="<?= htmlspecialchars(json_encode($ids)); ?>"
-		type-id ="<?= htmlspecialchars($typeid); ?>"
-<?php } ?>
 	>
 	</router-view>
 </div>

application/views/Studentenverwaltung.php

@@ -22,8 +22,7 @@
 			'public/css/components/function.css'
 		],
 		'customJSs' => [
-			'vendor/vuejs/vuedatepicker_js/vue-datepicker.iife.js',
-			'vendor/moment/luxonjs/luxon.min.js'
+			'vendor/vuejs/vuedatepicker_js/vue-datepicker.iife.js'
 			#'vendor/npm-asset/primevue/tree/tree.min.js',
 			#'vendor/npm-asset/primevue/toast/toast.min.js'
 		],
@@ -54,8 +53,6 @@ $configArray = [
 			active-addons="<?= defined('ACTIVE_ADDONS') ? ACTIVE_ADDONS : ''; ?>"
 			stv-root="<?= site_url('Studentenverwaltung'); ?>"
 			cis-root="<?= CIS_ROOT; ?>"
-			avatar-url="<?= site_url('Cis/Pub/bild/person/' . getAuthPersonId()); ?>" 
-			logout-url="<?= site_url('Cis/Auth/logout'); ?>"
 			:permissions="<?= htmlspecialchars(json_encode($permissions)); ?>"
 			:config="<?=  htmlspecialchars(json_encode($configArray)); ?>"
 			>

application/views/system/infocenter/onboarding.php

@@ -1,47 +0,0 @@
-<?php
-	$this->load->view(
-		'templates/FHC-Header',
-		array(
-			'title' => 'Info Center',
-			'jquery3' => true,
-			'jqueryui1' => true,
-			'jquerycheckboxes1' => true,
-			'bootstrap3' => true,
-			'fontawesome4' => true,
-			'sbadmintemplate3' => true,
-			'tablesorter2' => true,
-			'ajaxlib' => true,
-			'filterwidget' => true,
-			'navigationwidget' => true,
-			'dialoglib' => true,
-			'phrases' => array(
-				'person' => array('vorname', 'nachname'),
-				'ui' => array('bitteEintragWaehlen')
-			),
-			'customCSSs' => array('public/css/sbadmin2/tablesort_bootstrap.css', 'public/css/infocenter/infocenterPersonDataset.css'),
-			'customJSs' => array('public/js/bootstrapper.js', 'public/js/infocenter/rueckstellung.js', 'public/js/infocenter/infocenterPersonDataset.js')
-		)
-	);
-?>
-
-	<div id="wrapper">
-
-		<?php echo $this->widgetlib->widget('NavigationWidget'); ?>
-
-		<div id="page-wrapper">
-			<div class="container-fluid">
-				<div class="row">
-					<div class="col-lg-12">
-						<h3 class="page-header">
-							Electronic Onboarding
-						</h3>
-					</div>
-				</div>
-				<div>
-					<?php $this->load->view('system/infocenter/onboardingData.php'); ?>
-				</div>
-			</div>
-		</div>
-	</div>
-
-<?php $this->load->view('templates/FHC-Footer'); ?>

application/views/system/infocenter/onboardingData.php

@@ -1,116 +0,0 @@
-<?php
-
-	$APP = '\'infocenter\'';
-	$KENNZEICHEN = '\'eobRegistrierungsId\'';
-
-$query = '
-		SELECT
-			p.person_id AS "PersonId",
-			p.vorname AS "Vorname",
-			p.nachname AS "Nachname",
-			pl.zeitpunkt AS "LockDate",
-			pl.lockuser AS "LockUser",
-			rueck.datum_bis AS "HoldDate",
-			rueck.bezeichnung AS "Rueckstellgrund"
-		FROM public.tbl_person p
-			JOIN tbl_kennzeichen ON p.person_id = tbl_kennzeichen.person_id AND kennzeichentyp_kurzbz = '. $KENNZEICHEN .'
-			LEFT JOIN (
-					SELECT tpl.person_id,
-						   tpl.zeitpunkt,
-						   sp.nachname AS lockuser
-					  FROM system.tbl_person_lock tpl
-					  JOIN public.tbl_benutzer sb USING (uid)
-					  JOIN public.tbl_person sp ON sb.person_id = sp.person_id
-					 WHERE tpl.app = '.$APP.'
-				 ) pl ON p.person_id = pl.person_id
-			LEFT JOIN (
-				SELECT
-					tbl_rueckstellung.person_id,
-					tbl_rueckstellung.datum_bis,
-					tbl_rueckstellung.status_kurzbz,
-					array_to_json(bezeichnung_mehrsprachig::varchar[])->>0 as bezeichnung
-				FROM public.tbl_rueckstellung
-					JOIN public.tbl_rueckstellung_status USING(status_kurzbz)
-					JOIN public.tbl_person sp ON tbl_rueckstellung.person_id = sp.person_id
-				WHERE tbl_rueckstellung.rueckstellung_id =
-				(
-					SELECT srueck.rueckstellung_id
-					FROM public.tbl_rueckstellung srueck
-					WHERE srueck.person_id = tbl_rueckstellung.person_id
-						AND datum_bis >= NOW()
-					ORDER BY srueck.datum_bis DESC LIMIT 1
-				)
-			) rueck ON rueck.person_id = p.person_id
-		WHERE p.person_id NOT IN (SELECT person_id FROM public.tbl_prestudent)';
-
-	$filterWidgetArray = array(
-		'query' => $query,
-		'app' => InfoCenter::APP,
-		'datasetName' => 'onboarding',
-		'filter_id' => $this->input->get('filter_id'),
-		'requiredPermissions' => 'infocenter',
-		'datasetRepresentation' => 'tablesorter',
-		'checkboxes' => 'PersonId',
-		'additionalColumns' => array('Details'),
-		'columnsAliases' => array(
-			'PersonId',
-			ucfirst($this->p->t('person', 'vorname')) ,
-			ucfirst($this->p->t('person', 'nachname')),
-			ucfirst($this->p->t('global', 'sperrdatum')),
-			ucfirst($this->p->t('global', 'gesperrtVon')),
-			ucfirst($this->p->t('infocenter', 'rueckstelldatum')),
-			ucfirst($this->p->t('infocenter', 'rueckstellgrund')),
-		),
-
-		'formatRow' => function($datasetRaw) {
-			/* NOTE: Dont use $this here for PHP Version compatibility */
-			$datasetRaw->{'Details'} = sprintf(
-				'<a href="%s?person_id=%s&origin_page=%s&fhc_controller_id=%s&prev_filter_id=%s">Details</a>',
-				site_url('system/infocenter/InfoCenter/showDetails'),
-				$datasetRaw->{'PersonId'},
-				'onboarding',
-				(isset($_GET['fhc_controller_id']) ? $_GET['fhc_controller_id'] : ''),
-				(isset($_GET['filter_id']) ? $_GET['filter_id'] : '')
-			);
-
-			if ($datasetRaw->{'LockDate'} == null)
-			{
-				$datasetRaw->{'LockDate'} = '-';
-			}
-
-			if ($datasetRaw->{'LockUser'} == null)
-			{
-				$datasetRaw->{'LockUser'} = '-';
-			}
-
-			if ($datasetRaw->{'HoldDate'} == null)
-			{
-				$datasetRaw->{'HoldDate'} = '-';
-			}
-			else
-			{
-				$datasetRaw->{'HoldDate'} = date_format(date_create($datasetRaw->{'HoldDate'}), 'Y-m-d H:i');
-			}
-
-			if ($datasetRaw->{'Rueckstellgrund'} === null)
-			{
-				$datasetRaw->{'Rueckstellgrund'} = '-';
-			}
-
-			return $datasetRaw;
-		},
-
-		'markRow' => function($datasetRaw) {
-
-			if ($datasetRaw->LockDate != null)
-			{
-				return FilterWidget::DEFAULT_MARK_ROW_CLASS;
-			}
-		}
-
-
-
-	);
-
-	echo $this->widgetlib->widget('FilterWidget', $filterWidgetArray);
-?>

application/views/system/infocenter/stammdaten.php

@@ -106,7 +106,6 @@
 			<tbody>
 			<?php
 			$lastMailAdress = '';
-			$lastUnverifiedMailAdress = '';
 			foreach ($stammdaten->kontakte as $kontakt): ?>
 				<tr>
 				<?php if ($kontakt->kontakttyp === 'email'): ?>
@@ -120,16 +119,14 @@
 						<?php echo '<span class="kontakt '.$kontakt->kontakttyp.'" data-id="'. $kontakt->kontakt_id .'" data-value="' . $kontakt->kontakt .'">';?>
 						<?php if ($kontakt->kontakttyp === 'email'): ?>
 							<a href="mailto:<?php echo $kontakt->kontakt; ?>" target="_top">
-							<?php $lastMailAdress = $kontakt->kontakt; ?>
-						<?php elseif ($kontakt->kontakttyp === 'email_unverifiziert'): ?>
-							<?php $lastUnverifiedMailAdress = $kontakt->kontakt;
+							<?php $lastMailAdress = $kontakt->kontakt;
 							endif;
 							echo $kontakt->kontakt;
-						if ($kontakt->kontakttyp === 'email'):
+							if ($kontakt->kontakttyp === 'email'):
 							?>
 							</a>
-						<?php endif; ?>
-						<?php echo '</span>'?>
+							<?php endif; ?>
+					<?php echo '</span>'?>
 					</td>
 					<td><?php echo $kontakt->anmerkung; ?></td>
 				</tr>
@@ -143,9 +140,9 @@
 						<?php if (isset($adresse)): ?>
 							<div class="row adresse col-sm-12" data-id="<?php echo $adresse->adresse_id ?>">
 								<div class="float-left" data-value="<?php echo $adresse->strasse ?>" data-type="strasse"><?php echo $adresse->strasse ?></div>
-
+								
 								<div class="float-left" data-value="<?php echo $adresse->plz ?>" data-type="plz"><?php echo $adresse->plz ?></div>
-
+								
 								<div class="float-left" data-value="<?php echo $adresse->ort ?>" data-type="ort"><?php echo $adresse->ort ?></div>
 
 							<?php if (isset($adresse->nationkurztext)): ?>
@@ -185,8 +182,7 @@
 			</div>
 			<?php if (isset($stammdaten->zugangscode)): ?>
 				<div class="col-xs-6 text-right">
-					<a href="<?php echo CIS_ROOT.'addons/bewerbung/cis/registration.php?code='.html_escape($stammdaten->zugangscode)
-					.'&emailAdresse='.(isEmptyString($lastMailAdress)?$lastUnverifiedMailAdress:$lastMailAdress).'&keepEmailUnverified=true' ?>"
+					<a href="<?php echo CIS_ROOT.'addons/bewerbung/cis/registration.php?code='.html_escape($stammdaten->zugangscode).'&emailAdresse='.$lastMailAdress ?>"
 					   target='_blank'><i class="glyphicon glyphicon-new-window"></i>&nbsp;<?php echo  $this->p->t('infocenter','zugangBewerbung') ?></a>
 				</div>
 			<?php endif; ?>

cis/private/lehre/pruefung/pruefung.js.php

@@ -382,7 +382,7 @@ function writePruefungsTable(e, data, anmeldung)
 			}
 			else if(new Date() > minimumFrist)
 			{
-				button = "<p><a href='#' title='<?php echo $p->t('pruefung/anmeldenMoeglichBis'); ?> "+frist+"'><input style='width: 140px; background-color: green;' type='button' value='"+termin+" "+time+"' onclick='openDialog(\""+e.lehrveranstaltung[0].lehrveranstaltung_id+"\", \""+d.pruefungstermin_id+"\", \""+e.lehrveranstaltung[0].bezeichnung.replace("'", "&apos;")+"\", \""+d.von+"\", \""+d.bis+"\", \""+e.lehrveranstaltung[0].ects +"\");'></a></p>";
+				button = "<p><a href='#' title='<?php echo $p->t('pruefung/anmeldenMoeglichBis'); ?> "+frist+"'><input style='width: 140px; background-color: green;' type='button' value='"+termin+" "+time+"' onclick='openDialog(\""+e.lehrveranstaltung[0].lehrveranstaltung_id+"\", \""+d.pruefungstermin_id+"\", \""+e.lehrveranstaltung[0].bezeichnung.replace("'", "&apos;")+"\", \""+d.von+"\", \""+d.bis+"\");'></a></p>";
 			}
 		}
 		else
@@ -479,15 +479,13 @@ function showPruefungsDetails(prfId, lvId)
  * @param {type} lvBezeichnung Bezeichnung der Lehrveranstaltung
  * @param {type} terminVon Beginn der Prüfung
  * @param {type} terminBis Ende der Prüfung
- * @param {type} ects der LV
  * @returns {undefined}
  */
-function openDialog(lehrveranstaltung_id, termin_id, lvBezeichnung, terminVon, terminBis, ects)
+function openDialog(lehrveranstaltung_id, termin_id, lvBezeichnung, terminVon, terminBis)
 {
 	$("#lehrveranstaltungHidden").val(lehrveranstaltung_id);
 	$("#terminHidden").val(termin_id);
 	$("#lehrveranstaltung").html(lvBezeichnung);
-	$("#ectsangabe").val(ects);
 
 	$.ajax({
 		dataType: 'json',
@@ -584,12 +582,6 @@ function saveAnmeldung(lehrveranstaltung_id, termin_id)
 	if($('#prestudent_studiengang').length)
 		studiengang_kz =   $('#prestudent_studiengang option:selected').val();
 
-	var ects = null;
-	if ($('#ectsangabe').length)
-	{
-		ects = $('#ectsangabe').val();
-	}
-
 	$.ajax({
 		dataType: 'json',
 		url: "./pruefungsanmeldung.json.php",
@@ -601,8 +593,7 @@ function saveAnmeldung(lehrveranstaltung_id, termin_id)
 			bemerkung: bemerkungen,
 			uid: uid,
 			studienverpflichtung_id: studienverpflichtung_id,
-			studiengang_kz: studiengang_kz,
-			ects: ects
+			studiengang_kz: studiengang_kz
 		},
 		error: loadError,
 		success: function(data){
@@ -813,7 +804,6 @@ function writeAnmeldungen(data, showMessage = true)
 		var pruefung_id = data.result.anmeldungen[0].pruefung_id;
 		var lehrveranstaltung_id = data.result.anmeldungen[0].lehrveranstaltung_id;
 		var ort_kurzbz = data.result.ort_kurzbz;
-		var anderer_raum = data.result.anderer_raum;
 		var lv_bezeichnung = data.result.lv_bezeichnung;
 		var lv_lehrtyp = data.result.lv_lehrtyp;
 		var prf_termin = data.result.datum;
@@ -826,33 +816,24 @@ function writeAnmeldungen(data, showMessage = true)
 			count++;
 			var vorname = d.student.vorname !== "null" ? d.student.vorname : "";
 			var nachname = d.student.nachname !== "null" ? d.student.nachname : "";
-
-			let ects = "";
-			<?php if (defined('CIS_PRUEFUNGSANMELDUNG_ECTS_ANGABE') && (CIS_PRUEFUNGSANMELDUNG_ECTS_ANGABE === true)): ?>
-				ects = d.ects !== null ? "(" + d.ects + " ECTS) ": "";
-
-			<?php endif; ?>
-
 			switch(d.status_kurzbz)
 			{
 				case 'angemeldet':
-					liste += "<li class='ui-state-default' id='"+d.student.uid+"'><span class='ui-icon ui-icon-arrowthick-2-n-s'></span><a href='#' onclick='showKommentar(\""+vorname+"\",\""+nachname+"\", \""+d.pruefungsanmeldung_id+"\", \""+d.kommentar+"\", \""+terminId+"\", \""+lehrveranstaltung_id+"\");'>"+ects+vorname+" "+nachname+"</a>";
+					liste += "<li class='ui-state-default' id='"+d.student.uid+"'><span class='ui-icon ui-icon-arrowthick-2-n-s'></span><a href='#' onclick='showKommentar(\""+vorname+"\",\""+nachname+"\", \""+d.pruefungsanmeldung_id+"\", \""+d.kommentar+"\", \""+terminId+"\", \""+lehrveranstaltung_id+"\");'>"+vorname+" "+nachname+"</a>";
 					liste += "<div style='width: 3%; text-align: right;'>"+count+"</div><div style='text-align: center; width: 34%;'><input style='vertical-align: top; height: 24px;' type='button' value='<?php echo $p->t('pruefung/bestaetigen'); ?>' onclick='anmeldungBestaetigen(\""+d.pruefungsanmeldung_id+"\", \""+terminId+"\", \""+lehrveranstaltung_id+"\");'>";
 					liste += "<input style='vertical-align: top; height: 24px; background-color: #dd514c;' type='button' value='X' onclick='anmeldungLoeschen(\""+d.pruefungsanmeldung_id+"\", \""+terminId+"\", \""+lehrveranstaltung_id+"\");'></div>";
 					if(d.wuensche !== null)
 					{
-						let msg = $('<div>').text(d.wuensche).html();
-						liste += `<div class='anmerkungInfo'><a href='#' data-msg="${msg}" onclick="openKommentarDialog(this.dataset.msg)"><img style='width: 20px;' src='../../../../skin/images/button_lvinfo.png'></a></div>`;
+						liste += "<div class='anmerkungInfo'><a href='#' title='<?php echo $p->t('pruefung/anmerkungDesStudenten'); ?>"+d.wuensche+"'><img style='width: 20px;' src='../../../../skin/images/button_lvinfo.png'></a></div>";
 					}
 					liste += "</li>";
 					break;
 				case 'bestaetigt':
-					liste += "<li class='ui-state-default' id='"+d.student.uid+"'><span class='ui-icon ui-icon-arrowthick-2-n-s'></span><a href='#' onclick='showKommentar(\""+vorname+"\",\""+nachname+"\", \""+d.pruefungsanmeldung_id+"\", \""+d.kommentar+"\", \""+terminId+"\", \""+lehrveranstaltung_id+"\");'>"+ects+vorname+" "+nachname+"</a>";
+					liste += "<li class='ui-state-default' id='"+d.student.uid+"'><span class='ui-icon ui-icon-arrowthick-2-n-s'></span><a href='#' onclick='showKommentar(\""+vorname+"\",\""+nachname+"\", \""+d.pruefungsanmeldung_id+"\", \""+d.kommentar+"\", \""+terminId+"\", \""+lehrveranstaltung_id+"\");'>"+vorname+" "+nachname+"</a>";
 					liste += "<div style='width: 2%; text-align: right;'>"+count+"</div><div style='text-align: center; width: 20%;'><a href='#' title='<?php echo $p->t('pruefung/statusAenderungVon'); ?>: "+d.statusupdatevon+"'><?php echo $p->t('pruefung/bestaetigt'); ?></a></div>";
 					if(d.wuensche !== null)
 					{
-						let msg = $('<div>').text(d.wuensche).html();
-						liste += `<div class='anmerkungInfo'><a href='#' data-msg="${msg}" onclick="openKommentarDialog(this.dataset.msg)"><img style='width: 20px;' src='../../../../skin/images/button_lvinfo.png'></a></div>`;
+						liste += "<div class='anmerkungInfo'><a href='#' title='<?php echo $p->t('pruefung/anmerkungDesStudenten'); ?>"+d.wuensche+"'><img style='width: 20px;' src='../../../../skin/images/button_lvinfo.png'></a></div>";
 					}
 
 					break;
@@ -863,14 +844,13 @@ function writeAnmeldungen(data, showMessage = true)
 		});
 		liste += "</ul>";
 		$("#anmeldung_hinzufuegen").html("<input id='anmeldung_hinzufuegen_uid' type='text' placeholder='StudentIn-UID' /><input type='button' value='<?php echo $p->t('global/hinzufuegen'); ?>' onclick='saveAnmeldung(\""+lehrveranstaltung_id+"\",\""+terminId+"\");'/>");
-		$("#reihungSpeichernButton").html("<label for='emails'>E-Mail: <input type='email' id='emails' multiple /> <br /><br />" +
-			"<input type='button' value='<?php echo $p->t('pruefung/reihungSpeichern'); ?>' onclick='saveReihung(\""+terminId+"\", \""+lehrveranstaltung_id+"\");'><input type='button' value='<?php echo $p->t('pruefung/alleBestaetigen'); ?>' onclick='alleBestaetigen(\""+terminId+"\", \""+lehrveranstaltung_id+"\");'>");
+		$("#reihungSpeichernButton").html("<input type='button' value='<?php echo $p->t('pruefung/reihungSpeichern'); ?>' onclick='saveReihung(\""+terminId+"\", \""+lehrveranstaltung_id+"\");'><input type='button' value='<?php echo $p->t('pruefung/alleBestaetigen'); ?>' onclick='alleBestaetigen(\""+terminId+"\", \""+lehrveranstaltung_id+"\");'>");
 		$("#lvdaten").html(lv_bezeichnung+" ("+prf_termin+")");
 		$("#anmeldeDaten").html(liste);
 		$("#listeDrucken").html(listenLinks);
-		if(ort_kurzbz !== null || anderer_raum !== null)
+		if(ort_kurzbz !== null)
 		{
-			$("#raumLink").html("<span><?php echo $p->t('pruefung/pruefungsraum'); ?></span>"+ (ort_kurzbz ?? anderer_raum));
+			$("#raumLink").html("<span><?php echo $p->t('pruefung/pruefungsraum'); ?></span>"+ort_kurzbz);
 		}
 		else
 		{
@@ -903,17 +883,11 @@ function writeAnmeldungen(data, showMessage = true)
 function openRaumDialog(terminId, lehrveranstaltung_id)
 {
 	getRaeume(terminId);
-	$("#raum").html('<h2><?php echo $p->t('pruefung/pruefungsraum'); ?></h2><div id="raumInfos"><input onChange="changeStateOfRaumDropdown();" type="checkbox" /><span><?php echo $p->t('pruefung/imBuero'); ?></span><br /><span style="font-weight: bold;"><?php echo $p->t('pruefung/raum'); ?>: </span><select id="raeumeDropdown"></select><br /></div><input onChange="changeStateOfRaumInputs();" id="andererRaum" type="checkbox"/><span><?php echo $p->t('pruefung/andererRaum'); ?></span> <input type="text" id="andereRaumInput" placeholder="<?php echo $p->t('pruefung/andererRaum'); ?>"/><br />');
+	$("#raum").html('<h2><?php echo $p->t('pruefung/pruefungsraum'); ?></h2><input onChange="changeStateOfRaumDropdown();" type="checkbox" /><span><?php echo $p->t('pruefung/imBuero'); ?></span><br /><span style="font-weight: bold;"><?php echo $p->t('pruefung/raum'); ?>: </span><select id="raeumeDropdown"></select>');
 	$("#raumSpeichernButton").html("<input type='button' value='<?php echo $p->t('pruefung/raumSpeichern'); ?>' onclick='saveRaum(\""+terminId+"\", \""+lehrveranstaltung_id+"\");'/>");
 	$("#raumDialog").dialog("open");
 }
 
-function openKommentarDialog(text)
-{
-	$('#kommentarimDialog').text(text);
-	$('#kommentarDialog').dialog('open');
-}
-
 /**
  * speichert die Reihung der Studenten einer Prüfungsanmeldung
  * @param {type} terminId ID des Prüfungstermines
@@ -1037,30 +1011,6 @@ function anmeldungLoeschen(pruefungsanmeldung_id, termin_id, lehrveranstaltung_i
  */
 function alleBestaetigen(termin_id, lehrveranstaltung_id)
 {
-	const input = $('#emails').val();
-
-	let emails = '';
-	if (input)
-	{
-		emails = input.split(",").map(s => s.trim());
-		const re = /^([\w-+]+(?:\.[\w-+]+)*)@((?:[\w-]+\.)*\w[\w-]{0,66})\.([a-z]{2,63}(?:\.[a-z]{2})?)$/i;
-
-		let valid = true;
-		$.each(emails, function(index, email)
-		{
-			if (re.test(email) === false)
-			{
-				alert("<?php echo $p->t('pruefung/bitteEmailAngeben')?>");
-				valid = false;
-				return false;
-			}
-		});
-
-		if (!valid)
-			return false;
-
-	}
-
 	$.ajax({
 		dataType: 'json',
 		url: "./pruefungsanmeldung.json.php",
@@ -1068,8 +1018,7 @@ function alleBestaetigen(termin_id, lehrveranstaltung_id)
 		data: {
 			method: "alleBestaetigen",
 			termin_id: termin_id,
-			lehrveranstaltung_id: lehrveranstaltung_id,
-			emails: emails
+			lehrveranstaltung_id: lehrveranstaltung_id
 		},
 		error: loadError,
 		success: function(data){
@@ -1141,12 +1090,15 @@ function loadStudiengaenge()
 }
 
 /**
- * Lädt alle Prüfungen zu einem Studiensemester
- * @param {type} studiensemester Studiensemester
+ * Lädt alle Prüfungen zu einem Studiengang
+ * @param {type} studiengang_kz Studiengangskennzahl
  * @returns {undefined}
  */
-function loadPruefungStudiengang(studiensemester)
+function loadPruefungStudiengang(studiengang_kz, studiensemester)
 {
+	if(studiengang_kz === undefined)
+		studiengang_kz = $("#select_studiengang option:selected").val();
+
 	if(studiensemester === undefined)
 		studiensemester = $("#filter_studiensemester option:selected").val();
 
@@ -1155,7 +1107,8 @@ function loadPruefungStudiengang(studiensemester)
 		url: "./pruefungsanmeldung.json.php",
 		type: "POST",
 		data: {
-			method: "getPruefungenStudiensemester",
+			method: "getPruefungenStudiengang",
+			studiengang_kz: studiengang_kz,
 			studiensemester: studiensemester
 		},
 		error: loadError,
@@ -1165,61 +1118,25 @@ function loadPruefungStudiengang(studiensemester)
 				$("#pruefungenListe").empty();
 				if(data.result.length > 0)
 				{
-					$('#table4').show()
-					let rows = '';
-
-					data.result.forEach(function(e)
-					{
-						let termine = [];
-						if (e.pruefung) {
-							e.pruefung.forEach(p => {
-								if (p.termine) {
-									termine = termine.concat(p.termine);
-								}
+					var liste = "";
+					data.result.forEach(function(e){
+						liste += "<ul><li>"+e.bezeichnung+"<ul>";
+						try
+						{
+							e.pruefung[0].termine.forEach(function(d){
+								liste += "<li> <a onclick='showAnmeldungen(\""+d.pruefungstermin_id+"\", \""+e.lehrveranstaltung_id+"\");'>"+convertDateTime(d.von)+" "+convertDateTime(d.von, "time")+" - "+convertDateTime(d.bis, "time")+"</a></li>";
 							});
 						}
-
-						if (termine.length === 0)
+						catch(err)
 						{
-							rows += `
-								  <tr>
-									<td></td>
-									<td>${e.bezeichnung}</td>
-									<td colspan="5">Keine Termine</td>
-								  </tr>`;
-						}
-						else
-						{
-							termine.forEach(function(d) {
-								let vonDate = convertDateTime(d.von);
-								let vonTime = convertDateTime(d.von, 'time');
-								let bisTime = convertDateTime(d.bis, 'time');
-								let onClick = `showAnmeldungen(${d.pruefungstermin_id}, ${e.lehrveranstaltung_id})`;
-
-								rows += `
-									<tr>
-										<td><input type="checkbox"
-											class="termin-checkbox"
-											data-termin-id="${d.pruefungstermin_id}"
-											data-lv-id="${e.lehrveranstaltung_id}"
-											data-datum="${vonDate}"
-										/></td>
-										<td>${e.studiengang}</td>
-										<td>${e.bezeichnung}</td>
-										<td>${vonDate}</td>
-										<td>${vonTime}</td>
-										<td>${bisTime}</td>
-										<td><a onclick="${onClick}"><?php echo $p->t('pruefung/pruefungsbewertungAnmeldungen'); ?></a></td>
-									</tr>`;
-							});
+							var errmsg = err.message;
 						}
+						liste += "</ul></li></ul>";
 					});
-					$("#pruefungenListe").html(rows);
-					setTablesorter('table4')
+					$("#pruefungenListe").append(liste);
 				}
 				else
 				{
-					$('#table4').hide()
 					$("#pruefungenListe").html("<?php echo $p->t('pruefung/keinePruefungenVorhanden'); ?>");
 				}
 			}
@@ -1231,42 +1148,6 @@ function loadPruefungStudiengang(studiensemester)
 	});
 }
 
-function terminezusammenlegen(termine, lv_id)
-{
-	if(termine.length <= 1)
-		return;
-
-	$.ajax({
-		dataType: 'json',
-		url: "./pruefungsanmeldung.json.php",
-		type: "POST",
-		data: {
-			method: "terminezusammenlegen",
-			'termine[]': termine,
-			lv_id: lv_id
-		},
-		error: loadError,
-		success: function(data){
-			if(data.error === 'false')
-			{
-				loadPruefungStudiengang()
-				$("#anmeldung_hinzufuegen").empty();
-				$("#lvdaten").empty();
-				$("#anmeldeDaten").empty();
-				$("#reihungSpeichernButton").empty();
-				$("#kommentar").empty();
-				$("#kommentarSpeichernButton").empty();
-				$("#raumLink").empty();
-				$("#listeDrucken").empty();
-			}
-			else
-			{
-				messageBox("message", data.errormsg, "red", "highlight", 10000);
-			}
-		}
-	});
-}
-
 /**
  * Zeigt das Formularfeld zur Eingabe eines Kommentars in der Anmeldungsverwaltung an.
  * @param {String} vorname Vorname des Studenten
@@ -1360,7 +1241,6 @@ function loadStudiensemester()
 			data.result.forEach(function(d){
 				selectData += "<option "+((d.studiensemester_kurzbz === data.aktSem) ? "selected" : "")+" value='"+d.studiensemester_kurzbz+"'>"+d.studiensemester_kurzbz+"</option>";
 			});
-
 			$('#studiensemester').html(selectData);
 			loadPruefungsfenster();
 			loadLehrveranstaltungen();
@@ -1660,7 +1540,7 @@ function loadPruefungsDetails(prfId)
 			if(data.result.length === 0)
 			{
 				messageBox("message", "<?php echo $p->t('pruefung/keinePruefungsfensterGespeichert'); ?>", "red", "highlight", 10000);
-				$("#pruefungsfenster").html("<option value='null'><?php echo $p->t('pruefung/keinePruefungsfensterGespeichert'); ?></option>");
+				$("#pruefungsfenster").html("<option value='null'></option>");
 			}
 			else
 			{
@@ -2308,28 +2188,10 @@ function changeStateOfRaumDropdown()
 	}
 }
 
-function changeStateOfRaumInputs()
-{
-	if ($("#andererRaum").prop("checked") === true)
-	{
-		$("#raumInfos").hide();
-	}
-	else
-	{
-		$("#raumInfos").show();
-	}
-}
-
 function saveRaum(terminId, lehrveranstaltung_id)
 {
 	var ort_kurzbz;
-	let anderer_raum = '';
-	if ($("#andererRaum").prop("checked") === true && $('#andereRaumInput').val() !== '')
-	{
-		ort_kurzbz = "";
-		anderer_raum = $('#andereRaumInput').val();
-	}
-	else if($("#raum input[type=checkbox]").prop("checked") === true)
+	if($("#raum input[type=checkbox]").prop("checked") === true)
 	{
 		ort_kurzbz = "buero";
 	}
@@ -2344,8 +2206,7 @@ function saveRaum(terminId, lehrveranstaltung_id)
 		data: {
 			method: "saveRaum",
 			ort_kurzbz: ort_kurzbz,
-			terminId: terminId,
-			anderer_raum: anderer_raum
+			terminId: terminId
 		},
 		error: loadError
 	}).done(function(data){

cis/private/lehre/pruefung/pruefungsanmeldung.json.php

@@ -106,14 +106,9 @@ switch($method)
 	case 'getStudiengaenge':
 		$data = getStudiengaenge();
 		break;
-	case 'getPruefungenStudiensemester':
+	case 'getPruefungenStudiengang':
 		$studiensemester = filter_input(INPUT_POST,"studiensemester");
-		$data = getPruefungenStudiengangBySemester($studiensemester);
-		break;
-	case 'terminezusammenlegen':
-		$termine = filter_input(INPUT_POST, 'termine', FILTER_DEFAULT, FILTER_REQUIRE_ARRAY);
-		$lv_id = filter_input(INPUT_POST, 'lv_id');
-		$data = terminezusammenlegen($termine, $lv_id);
+		$data = getPruefungenStudiengang($uid, $studiensemester);
 		break;
 	case 'saveKommentar':
 		$data = saveKommentar();
@@ -125,8 +120,7 @@ switch($method)
 	case 'saveRaum':
 		$terminId = $_REQUEST["terminId"];
 		$ort_kurzbz = $_REQUEST["ort_kurzbz"];
-		$anderer_raum = $_REQUEST["anderer_raum"];
-		$data = saveRaum($terminId, $ort_kurzbz, $uid, $anderer_raum);
+		$data = saveRaum($terminId, $ort_kurzbz, $uid);
 		break;
 	case 'getLvKompatibel':
 		$lvid = filter_input(INPUT_POST, "lehrveranstaltung_id");
@@ -403,7 +397,6 @@ function saveAnmeldung($aktStudiensemester = null, $uid = null)
 	$lv_besucht = false;
 	$studienverpflichtung_id = filter_input(INPUT_POST, "studienverpflichtung_id");
 	$studiengang_kz = filter_input(INPUT_POST, "studiengang_kz");
-	$ects = filter_input(INPUT_POST, "ects");
 
 	//Defaulteinstellung für Anzahlprüfungsversuche (wird durch Addon "ktu" überschrieben)
 	$maxAnzahlVersuche = 0;
@@ -738,10 +731,6 @@ function saveAnmeldung($aktStudiensemester = null, $uid = null)
 					else
 						$anmeldung->anrechnung_id = $anrechnung->anrechnung_id;
 
-					if (defined('CIS_PRUEFUNGSANMELDUNG_ECTS_ANGABE') && (CIS_PRUEFUNGSANMELDUNG_ECTS_ANGABE === true))
-					{
-						$anmeldung->ects = $ects;
-					}
 					if($anmeldung->save(true))
 					{
 						$pruefung = new pruefungCis($termin->pruefung_id);
@@ -971,13 +960,9 @@ function alleBestaetigen($uid)
 	global $p;
 	$lehrveranstaltung_id = $_REQUEST["lehrveranstaltung_id"];
 	$pruefungstermin_id = $_REQUEST["termin_id"];
-	$emails = $_REQUEST["emails"];
 	$pruefungstermin = new pruefungstermin($pruefungstermin_id);
 	$pruefungsanmeldung = new pruefungsanmeldung();
 	$pranmeldungen = $pruefungsanmeldung->getAnmeldungenByTermin($pruefungstermin_id, $lehrveranstaltung_id);
-
-	$mail_benutzer = [];
-	$mail_inhalt = [];
 	foreach($pranmeldungen as $a)
 	{
 		$anmeldung = new pruefungsanmeldung($a->pruefungsanmeldung_id);
@@ -991,13 +976,6 @@ function alleBestaetigen($uid)
 				$ma = new mitarbeiter($uid);
 				$datum = new datum();
 				$ort = new ort($termin->ort_kurzbz);
-
-				$ortbezeichnung = $ort->bezeichnung;
-				if (is_null($termin->ort_kurzbz) && !is_null($termin->anderer_raum))
-				{
-					$ortbezeichnung = $termin->anderer_raum;
-				}
-
 				$pruefung = new pruefungCis($termin->pruefung_id);
 
 				$to = $anm->uid."@".DOMAIN;
@@ -1017,66 +995,17 @@ function alleBestaetigen($uid)
 				}
 				else
 					$html .= $p->t('pruefung/emailBodyTermin')." ".$datum->formatDatum($termin->von, "d.m.Y")." ".$p->t('pruefung/emailBodyUm')." ".$datum->formatDatum($termin->von, "H:i")."<br>";
-				$html .= $p->t('pruefung/anmeldungErfolgreich')." ".$ortbezeichnung."<br>";
+				$html .= $p->t('pruefung/anmeldungErfolgreich')." ".$ort->bezeichnung."<br>";
 				$html .= "<br>";
 				$html .= "<a href='".APP_ROOT."cis/private/lehre/pruefung/pruefungsanmeldung.php'>".$p->t('pruefung/emailBodyLinkZurAnmeldung')."</a><br>";
 				$html .= "<br>";
 
-				$mail_benutzer[] = [
-					'uid' => $anm->uid
-				];
-
-				if (empty($mail_inhalt))
-				{
-					$mail_inhalt = array(
-						'von' => $ma->vorname." ".$ma->nachname,
-						'lv' => $lv->bezeichnung,
-						'ort' => $ortbezeichnung,
-						'datum' => $datum->formatDatum($termin->von, "d.m.Y") . ' ' . $p->t('pruefung/emailBodyUm') . ' ' . (isset($von) ? $von : $datum->formatDatum($termin->von, "H:i")),
-						'dauer' => $pruefung->einzeln ? ($pruefung->pruefungsintervall . ' ' . $p->t('pruefung/emailBodyMinuten')): '');
-				}
-
 				$mail = new mail($to, $from, $subject,$p->t('pruefung/emailBodyBitteHtmlSicht'));
 				$mail->setHTMLContent($html);
 				$mail->send();
 			}
 		}
 	}
-
-	if (!empty($emails) && !empty($mail_inhalt))
-	{
-		foreach ($emails as $email)
-		{
-			$from = "noreply@".DOMAIN;
-			$subject = $p->t('pruefung/emailSubjectAnmeldungBestaetigung');
-			$html = $p->t('pruefung/sammelemailBody',array($mail_inhalt['lv'], $mail_inhalt['datum'], $mail_inhalt['von']));
-
-			if ($mail_inhalt['ort'])
-			{
-				$html .= $p->t('pruefung/sammelemailBody2',array($mail_inhalt['ort']));
-			}
-
-			$html .= "<br /><table border='1'>
-						<thead>
-							<tr>
-								<th>UID</th>
-							</tr>
-						</thead>
-						<tbody>";
-
-			foreach($mail_benutzer as $benutzer)
-			{
-				$html .= "<tr>
-							<td>" . htmlspecialchars($benutzer['uid']) . "</td>
-						</tr>";
-			}
-			$html .= "</tbody></table><br />";
-
-			$mail = new mail($email, $from, $subject, $p->t('pruefung/emailBodyBitteHtmlSicht'));
-			$mail->setHTMLContent($html);
-			$mail->send();
-		}
-	}
 	$data['result']=true;
 	$data['error']='false';
 	$data['errormsg']='';
@@ -1103,12 +1032,6 @@ function anmeldungBestaetigen($uid)
 	$ort = new ort($termin->ort_kurzbz);
 	$pruefung = new pruefungCis($termin->pruefung_id);
 
-	$ortbezeichnung = $ort->bezeichnung;
-	if (is_null($termin->ort_kurzbz) && !is_null($termin->anderer_raum))
-	{
-		$ortbezeichnung = $termin->anderer_raum;
-	}
-
 	$to = $anmeldung->uid."@".DOMAIN;
 	$from = "noreply@".DOMAIN;
 	$subject = $p->t('pruefung/emailSubjectAnmeldungBestaetigung');
@@ -1126,7 +1049,7 @@ function anmeldungBestaetigen($uid)
 	}
 	else
 		$html .= $p->t('pruefung/emailBodyTermin')." ".$datum->formatDatum($termin->von, "d.m.Y")." ".$p->t('pruefung/emailBodyUm')." ".$datum->formatDatum($termin->von, "H:i")."<br>";
-	$html .= $p->t('pruefung/anmeldungErfolgreich')." ".$ortbezeichnung."<br>";
+	$html .= $p->t('pruefung/anmeldungErfolgreich')." ".$ort->bezeichnung."<br>";
 	$html .= "<br>";
 	$html .= "<a href='".APP_ROOT."cis/private/lehre/pruefung/pruefungsanmeldung.php'>".$p->t('pruefung/emailBodyLinkZurAnmeldung')."</a><br>";
 	$html .= "<br>";
@@ -1243,258 +1166,6 @@ function getPruefungenStudiengang($uid, $aktStudiensemester)
 	return $data;
 }
 
-function getPruefungenStudiengangBySemester($aktStudiensemester)
-{
-	$result = array();
-	$pruefungen = new pruefungCis();
-	$pruefungen->getPruefungByStudiensemester($aktStudiensemester);
-
-	if(!empty($pruefungen->lehrveranstaltungen))
-	{
-		$lehrveranstaltungen = [];
-		foreach ($pruefungen->lehrveranstaltungen as $prf)
-		{
-			$pruefung = new pruefungCis();
-			$pruefung->load($prf->pruefung_id);
-
-			if ($pruefung->storniert)
-				continue;
-
-			$pruefung->getTermineByPruefung();
-
-			$lvid = $prf->lehrveranstaltung_id;
-
-			if (!isset($lehrveranstaltungen[$lvid]))
-			{
-				$lv = new stdClass();
-				$lehrveranstaltung = new lehrveranstaltung();
-				$lehrveranstaltung->load($lvid);
-
-				$studiengang = new studiengang();
-				$studiengang->load($lehrveranstaltung->studiengang_kz);
-
-				$lv->bezeichnung = $lehrveranstaltung->bezeichnung;
-				$lv->lehrveranstaltung_id = $lvid;
-				$lv->studiengang = $studiengang->kuerzel;
-				$lv->pruefung = [];
-				$lehrveranstaltungen[$lvid] = $lv;
-			}
-
-			$lehrveranstaltungen[$lvid]->pruefung[] = $pruefung;
-		}
-		$result = array_values($lehrveranstaltungen);
-	}
-	$data['result']=$result;
-	$data['error']='false';
-	$data['errormsg']='';
-	return $data;
-}
-
-function terminezusammenlegen($termine, $lv_id)
-{
-	$result = array();
-	$alle_termine = array();
-	$error = false;
-	$terminkollision = defined('CIS_PRUEFUNGSANMELDUNG_ERLAUBE_TERMINKOLLISION') ? CIS_PRUEFUNGSANMELDUNG_ERLAUBE_TERMINKOLLISION : false;
-	foreach($termine as $termin)
-	{
-		$pruefungstermin = new pruefungstermin();
-		$pruefungstermin->load($termin);
-		$pruefung = new pruefungCis();
-		$pruefung->load($pruefungstermin->pruefung_id);
-		$pruefung->getLehrveranstaltungenByPruefung();
-
-		$lehrveranstaltungen = array_column($pruefung->lehrveranstaltungen, 'lehrveranstaltung_id');
-		if (!in_array($lv_id, $lehrveranstaltungen))
-			continue;
-
-		$pruefung->lehrveranstaltung_id = $lv_id;
-		$pruefung->termin = $pruefungstermin;
-		$alle_termine[] = $pruefung;
-	}
-
-
-	if (count($alle_termine) >= 1)
-	{
-		usort($alle_termine, function($a, $b) {
-			return strcmp($a->termin->von, $b->termin->von);
-		});
-
-		$first_termin = $alle_termine[0];
-
-		$first_mitarbeiter = $first_termin->mitarbeiter_uid;
-		$first_date = date('Y-m-d', strtotime($first_termin->termin->von));
-		$first_studiensemester = $first_termin->studiensemester_kurzbz;
-		$first_sammelklausur = $first_termin->termin->sammelklausur;
-		$first_ort = $first_termin->termin->ort_kurzbz;
-		$first_raum = $first_termin->termin->anderer_raum;
-		$first_lv = $first_termin->lehrveranstaltung_id;
-		$first_titel = $first_termin->titel;
-
-		$max_von = strtotime($first_termin->termin->von);
-		$max_bis = strtotime($first_termin->termin->bis);
-		$teilnehmer_min = (int)$first_termin->termin->teilnehmer_min;
-		$teilnehmer_max = (int)$first_termin->termin->teilnehmer_max;
-
-
-		$prevEnd = $max_bis;
-
-		foreach ($alle_termine as $termin)
-		{
-			if (date('Y-m-d', strtotime($termin->termin->von)) !== $first_date)
-			{
-				$data['errormsg'] = 'Nicht der gleiche Tag!';
-				$error = true;
-			}
-
-			if ($termin->mitarbeiter_uid !== $first_mitarbeiter)
-			{
-				$data['errormsg'] = 'Unterschiedliche Lektoren!';
-				$error = true;
-			}
-
-			if ($termin->studiensemester_kurzbz !== $first_studiensemester)
-			{
-				$data['errormsg'] = 'Unterschiedliche Studiensemester!';
-				$error = true;
-			}
-
-			if ($termin->termin->sammelklausur !== $first_sammelklausur)
-			{
-				$data['errormsg'] = 'Sammelklausur unterschiedlich!';
-				$error = true;
-			}
-
-			if (!($termin->termin->ort_kurzbz === $first_ort || $first_termin->termin->anderer_raum == $first_raum))
-			{
-				$data['errormsg'] = 'Ort/Raum unterschiedlich!';
-				$error = true;
-			}
-
-			if ($termin->lehrveranstaltung_id !== $first_lv)
-			{
-				$data['errormsg'] = 'Lehrveranstaltungen unterscheiden sich!';
-				$error = true;
-			}
-
-
-			$start = strtotime($termin->termin->von);
-			$max_von = min($max_von, $start);
-			$max_bis = max($max_bis, strtotime($termin->termin->bis));
-			$teilnehmer_min = min($teilnehmer_min, (int)$termin->termin->teilnehmer_min);
-			$teilnehmer_max = max($teilnehmer_max, (int)$termin->termin->teilnehmer_max);
-
-			if (($start - $prevEnd > 0) && $first_ort)
-			{
-				$stunde = new stunde();
-
-				$gapStartStr = date('Y-m-d H:i:s', $prevEnd);
-				$gapEndStr = date('Y-m-d H:i:s', $start);
-
-				$gapStartArr = explode(' ', $gapStartStr);
-				$gapEndArr = explode(' ', $gapEndStr);
-
-				$stunden = $stunde->getStunden($gapStartArr[1], $gapEndArr[1]);
-
-				$reservierung = new reservierung();
-				$reserviert = false;
-
-				$reservierungs_stunden = $reservierung->getReservierungen($first_ort, $gapStartArr[0]);
-
-				$need_stunden = array_diff($stunden, $reservierungs_stunden);
-
-				foreach ($need_stunden as $h)
-				{
-					if ($reservierung->isReserviert($first_ort, $gapStartArr[0], $h))
-						$reserviert = true;
-				}
-
-				if (!$terminkollision && $reserviert && !$first_sammelklausur)
-				{
-					$error = true;
-					$data['errormsg'] = 'Kann nicht zusammengelegt werden, da der Raum reserviert ist';
-				}
-				else
-				{
-					$reservierung->studiengang_kz = "0";
-					$reservierung->ort_kurzbz = $first_ort;
-					$reservierung->uid = $first_mitarbeiter;
-					$reservierung->datum = $gapStartArr[0];
-					$reservierung->titel = $first_titel;
-					if (strlen($first_titel) > 10)
-					{
-						$reservierung->titel = "Prüfung";
-					}
-					$reservierung->beschreibung = "Prüfung";
-					$reservierung->insertamum = date('Y-m-d G:i:s');
-					$reservierung->insertvon = get_uid();
-					$reservierungError = false;
-
-					foreach ($need_stunden as $h)
-					{
-						$reservierung->stunde = $h;
-						if (!$reservierungError)
-						{
-							if (!$reservierung->save(true))
-							{
-								$error = true;
-								$data['errormsg'] = $reservierung->errormsg;
-								$reservierungError = true;
-							}
-						}
-					}
-				}
-			}
-			$prevEnd = strtotime($termin->termin->bis);
-		}
-
-		if (!$error)
-		{
-			$first_pruefungstermin =  new pruefungstermin();
-			$first_pruefungstermin->load($first_termin->termin->pruefungstermin_id);
-
-			$first_pruefungstermin->von = date('Y-m-d H:i:s', $max_von);
-			$first_pruefungstermin->bis = date('Y-m-d H:i:s', $max_bis);
-			$first_pruefungstermin->teilnehmer_min = $teilnehmer_min;
-			$first_pruefungstermin->teilnehmer_max = $teilnehmer_max;
-
-			$first_pruefungstermin->save();
-
-			$alle_termine = array_slice($alle_termine, 1);
-
-			foreach ($alle_termine as $termin)
-			{
-				$anmeldung_termin = new pruefungsanmeldung();
-				$anmeldungen_termine = $anmeldung_termin->getAnmeldungenByTermin($termin->termin->pruefungstermin_id);
-
-				if (count($anmeldungen_termine) === 0)
-				{
-					$first_pruefungstermin->delete($termin->termin->pruefungstermin_id);
-				}
-				$i = 0;
-				$anmeldungen_termine_count = count($anmeldungen_termine);
-				foreach ($anmeldungen_termine as $anmeldungtermin)
-				{
-					$anmeldung = new pruefungsanmeldung();
-					$anmeldung->load($anmeldungtermin->pruefungsanmeldung_id);
-					$old_pruefuengstermin_id = $anmeldung->pruefungstermin_id;
-					$anmeldung->pruefungstermin_id = $first_termin->termin->pruefungstermin_id;
-					if ($anmeldung->save(false) && ($i === $anmeldungen_termine_count - 1))
-					{
-						$first_pruefungstermin->delete($old_pruefuengstermin_id);
-					}
-					$i ++;
-				}
-			}
-		}
-	}
-
-	$data['result']= $result;
-	$data['error']= $error ? 'true' : 'false';
-	//$data['errormsg']='';
-	return $data;
-}
-
 /**
  *
  * @return typespeichert ein Kommentar zu einer Prüfungsanmeldung
@@ -1575,7 +1246,7 @@ function compareRaeume($a, $b)
 	return strcmp($a->ort_kurzbz, $b->ort_kurzbz);
 }
 
-function saveRaum($terminId, $ort_kurzbz, $uid, $anderer_raum = '')
+function saveRaum($terminId, $ort_kurzbz, $uid)
 {
 	$terminkollision = defined('CIS_PRUEFUNGSANMELDUNG_ERLAUBE_TERMINKOLLISION') ? CIS_PRUEFUNGSANMELDUNG_ERLAUBE_TERMINKOLLISION : false;
 	$pruefungstermin = new pruefungstermin($terminId);
@@ -1594,24 +1265,7 @@ function saveRaum($terminId, $ort_kurzbz, $uid, $anderer_raum = '')
 	{
 	$pruefung = new pruefungCis($pruefungstermin->pruefung_id);
 	$mitarbeiter = new mitarbeiter($pruefung->mitarbeiter_uid);
-
-	if ($ort_kurzbz === "" && $anderer_raum !== "")
-	{
-		$pruefungstermin->anderer_raum = $anderer_raum;
-
-		if($pruefungstermin->save(false))
-		{
-			$data['result']="reserviert";
-			$data['error']='false';
-			$data['errormsg']='';
-		}
-		else
-		{
-			$data['error']='true';
-			$data['errormsg']=$pruefungstermin->errormsg;
-		}
-	}
-	else if($ort_kurzbz === "buero")
+	if($ort_kurzbz === "buero")
 	{
 		$pruefungstermin->ort_kurzbz = $mitarbeiter->ort_kurzbz;
 		if($pruefungstermin->save(false))

cis/private/lehre/pruefung/pruefungsanmeldung.php

@@ -321,20 +321,6 @@ $studiensemester->getAll();
 				</td>
 			</tr>
 			<?php endif; ?>
-
-			<?php
-			if (defined('CIS_PRUEFUNGSANMELDUNG_ECTS_ANGABE')
-				&& CIS_PRUEFUNGSANMELDUNG_ECTS_ANGABE === true):
-			?>
-			<tr>
-				<td style="vertical-align: top; font-weight: bold;">
-					<?php echo $p->t('pruefung/ects'); ?>:
-				</td>
-				<td>
-					<input type="number" size="3" id="ectsangabe" placeholder="<?php echo $p->t('pruefung/ects'); ?>"/>
-				</td>
-			</tr>
-			<?php endif; ?>
 			<tr id="studiengang">
 			</tr>
 			<tr>

cis/private/lehre/pruefung/pruefungsanmeldungen_liste.php

@@ -235,18 +235,12 @@ $rechte->getBerechtigungen($uid);
 			<th><?php echo $p->t('global/datum'); ?></th>
 			<th><?php echo $p->t('benotungstool/note'); ?></th>
 			<th><?php echo $p->t('global/anmerkung'); ?></th>
-
-			<?php
-				if (defined('CIS_PRUEFUNGSANMELDUNG_ECTS_ANGABE') && (CIS_PRUEFUNGSANMELDUNG_ECTS_ANGABE === true)):
-			?>
-				<th><?php echo $p->t('pruefung/ects'); ?></th>
-			<?php endif; ?>
-
 			</tr>
 		</thead>
 		<tbody>
 			<?php
 			$count = 0;
+			/*@var $anmeldung pruefungsanmeldung */
 			foreach($anmeldungen as $anmeldung)
 			{
 				$student = new student($anmeldung->uid);
@@ -275,8 +269,6 @@ $rechte->getBerechtigungen($uid);
 				echo '<td>'.$date.'</td>';
 				echo '<td></td>';
 				echo '<td></td>';
-				if (defined('CIS_PRUEFUNGSANMELDUNG_ECTS_ANGABE') && (CIS_PRUEFUNGSANMELDUNG_ECTS_ANGABE === true))
-					echo '<td>'. $anmeldung->ects .'</td>';
 				echo '</tr>';
 			}
 			?>

cis/private/lehre/pruefung/pruefungsanmeldungen_liste_ohne_namen.php

@@ -233,11 +233,6 @@ $rechte->getBerechtigungen($uid);
 			<th><?php echo $p->t('global/datum'); ?></th>
 			<th><?php echo $p->t('benotungstool/note'); ?></th>
 			<th><?php echo $p->t('global/anmerkung'); ?></th>
-			<?php
-				if (defined('CIS_PRUEFUNGSANMELDUNG_ECTS_ANGABE') && (CIS_PRUEFUNGSANMELDUNG_ECTS_ANGABE === true)):
-			?>
-				<th><?php echo $p->t('pruefung/ects'); ?></th>
-			<?php endif; ?>
 			</tr>
 		</thead>
 		<tbody>
@@ -270,8 +265,6 @@ $rechte->getBerechtigungen($uid);
 				echo '<td>'.$date.'</td>';
 				echo '<td></td>';
 				echo '<td></td>';
-				if (defined('CIS_PRUEFUNGSANMELDUNG_ECTS_ANGABE') && (CIS_PRUEFUNGSANMELDUNG_ECTS_ANGABE === true))
-					echo '<td>'. $anmeldung->ects .'</td>';
 				echo '</tr>';
 			}
 			?>

cis/private/lehre/pruefung/pruefungsanmeldungen_verwalten.php

@@ -76,7 +76,7 @@ if (empty($pruefung->result) && !$rechte->isBerechtigt('lehre/pruefungsanmeldung
 		width: 850px;
 		padding: 1.8em 1.5em 1.8em 1em;
 		/*border-radius: 25px;*/
-		/*border: 1px solid #dddddd;*/
+		border: 1px solid #dddddd;
 		/*box-shadow: 0em 0em 2em 0.5em #888888 inset;*/
 		}
 
@@ -95,7 +95,7 @@ if (empty($pruefung->result) && !$rechte->isBerechtigt('lehre/pruefungsanmeldung
 		#prfWrapper {
 		position: absolute;
 		height: 70%;
-		width: 40%;
+		width: 300px;
 		top: 180px;
 		padding: 1.8em 1.5em 1.8em 1em;
 		/*border-radius: 25px;*/
@@ -117,9 +117,9 @@ if (empty($pruefung->result) && !$rechte->isBerechtigt('lehre/pruefungsanmeldung
 		#anmWrapper {
 		position: absolute;
 		/*top: 45px;*/
-		left: 45%;
+		left: 350px;
 		top: 180px;
-		width: 40%;
+		width: 500px;
 		height: 70%;
 		padding: 1.8em 1.5em 1.8em 1em;
 		/*border-radius: 25px;*/
@@ -228,6 +228,7 @@ if (empty($pruefung->result) && !$rechte->isBerechtigt('lehre/pruefungsanmeldung
 	<script>
 		$(document).ready(function()
 		{
+			loadStudiengaenge();
 			$("#filter_studiensemester").css("visibility","visible");
 
 			$("#raumDialog").dialog({
@@ -235,66 +236,17 @@ if (empty($pruefung->result) && !$rechte->isBerechtigt('lehre/pruefungsanmeldung
 				autoOpen: false,
 				width: "400px"
 			});
-
-			$("#kommentarDialog").dialog({
-				modal: true,
-				autoOpen: false,
-				width: "400px",
-				buttons: {
-					Ok: function() {
-						$(this).dialog('close');
-					}
-				}
-			});
-
-			$("#table4").tablesorter({
-				widgets: ["zebra"],
-				headers: {
-					0: { sorter: false },
-					3: { sorter: 'shortDate',
-						dateFormat: 'ddmmyyyy' },
-					4: { sorter: 'time' },
-					5: { sorter: 'time' }
-				}
-			});
-
-
-			$('#zusammenlegen').on('click', function() {
-				let ausgewaehlte_termine = $('.termin-checkbox:checked');
-
-				if (ausgewaehlte_termine.length === 0)
-					return;
-
-				let erster_termin = ausgewaehlte_termine.first();
-				let erstes_datum = erster_termin.data('datum');
-				let erste_lvid = erster_termin.data('lv-id');
-
-				let termine = [];
-				ausgewaehlte_termine.each(function() {{
-					let termin = $(this);
-					let datum = termin.data('datum');
-					let lv_id = termin.data('lv-id');
-
-					if (erstes_datum !== datum)
-						return alert("Die ausgewählten Termine liegen nicht am selben Tag und können daher nicht zusammengelegt werden.")
-					if (erste_lvid !== lv_id)
-						return alert("Bei den ausgewählten Terminen handelt es sich um unterschiedliche Lehrveranstaltungen, die daher nicht zusammengelegt werden können.")
-
-					termine.push(termin.data('termin-id'));
-				}})
-
-				if (termine.length > 0)
-				{
-					terminezusammenlegen(termine, erste_lvid);
-				}
-			})
-
-			loadPruefungStudiengang();
 		});
 	</script>
 	<h1><?php echo $p->t('pruefung/anmeldungenVerwalten'); ?></h1>
 	<div id='stgWrapper'>
+		<div id='studiengaenge'>
+		<div>
+			<h2><?php echo $p->t('global/studiengang'); ?></h2>
+			<div id='stgListe'>
 
+			</div>
+		</div>
 		<div>
 			<h2><?php echo $p->t('global/studiensemester'); ?></h2>
 			<?php
@@ -303,6 +255,7 @@ if (empty($pruefung->result) && !$rechte->isBerechtigt('lehre/pruefungsanmeldung
 			$studiensemester->getPlusMinus(null, 5);
 			foreach($studiensemester->studiensemester as $sem)
 			{
+				/*@var $sem studiensemester */
 				if ($aktuellesSemester == $sem->studiensemester_kurzbz)
 				{
 				echo '<option selected value="'.$sem->studiensemester_kurzbz.'">'.$sem->bezeichnung.'</option>';
@@ -320,21 +273,9 @@ if (empty($pruefung->result) && !$rechte->isBerechtigt('lehre/pruefungsanmeldung
 	<div id='prfWrapper'>
 		<div id='pruefungen'>
 		<h2><?php echo $p->t('pruefung/pruefungPruefungenTitle'); ?></h2>
-		<button id="zusammenlegen">Termine zusammenlegen</button>
-		<table id="table4" class="tablesorter" style="display:none">
-			<thead>
-				<tr>
-					<th></th>
-					<th><?php echo $p->t('global/studiengang'); ?></th>
-					<th><?php echo $p->t('global/lehrveranstaltung'); ?></th>
-					<th><?php echo $p->t('global/datum'); ?></th>
-					<th><?php echo $p->t('global/von'); ?></th>
-					<th><?php echo $p->t('global/bis'); ?></th>
-					<th><?php echo $p->t('pruefung/pruefungsbewertungAnmeldungen'); ?></th>
-				</tr>
-			</thead>
-			<tbody id="pruefungenListe"></tbody>
-		</table>
+		<ul id="pruefungenListe">
+
+		</ul>
 		</div>
 	</div>
 	<div id='anmWrapper'>
@@ -370,9 +311,6 @@ if (empty($pruefung->result) && !$rechte->isBerechtigt('lehre/pruefungsanmeldung
 			</div>
 		</div>
 		</div>
-		<div id="kommentarDialog" title="<?php echo $p->t('pruefung/anmerkungDesStudenten'); ?>" style="display:none;">
-			<div id="kommentarimDialog"></div>
-		</div>
 	</div>
 
 	<div id="message"></div>

cis/private/profile/studienplan.php

@@ -69,8 +69,6 @@ if(isset($_GET['getAnmeldung']))
 
 	$lehrveranstaltung_id=$_GET['lehrveranstaltung_id'];
 	$stsem = $_GET['stsem'];
-	$semester = $_GET['semester'];
-	$studienplan_id = $_GET['studienplan_id'];
 
 	echo $p->t('studienplan/LehrveranstalungWaehlen').'
 		<form action="'.$_SERVER['PHP_SELF'].'?uid='.$db->convert_html_chars($uid).'" method="POST">
@@ -85,10 +83,6 @@ if(isset($_GET['getAnmeldung']))
 	$datum = new datum();
 	$kompatibel[]=$lehrveranstaltung_id;
 	$kompatibel = array_unique($kompatibel);
-	$stsem_obj = new studiensemester();
-	$aktornext = $stsem_obj->getaktorNext();
-
-	$lvregel = new lvregel();
 	foreach($kompatibel as $lvid)
 	{
 		$lvangebot = new  lvangebot();
@@ -101,50 +95,19 @@ if(isset($_GET['getAnmeldung']))
 			$angebot = $lvangebot->result[0];
 			if($angebot->AnmeldungMoeglich())
 			{
-				$kompatible_lv = $lehrveranstaltung->getStudienplanLehrveranstaltung($lvid, $studienplan_id);
+				$anzahl++;
+				// LV wird angeboten und Anmeldefenster ist offen
 
-				$lvregelExists = false;
-				$abgeschlossen = false;
-				$semesterlock = false;
-				$regelerfuellt = true;
-
-				if ($kompatible_lv)
+				$bngruppe = new benutzergruppe();
+				if(!$bngruppe->load($uid, $lvangebot->result[0]->gruppe_kurzbz, $stsem))
 				{
-					$lvregelExists = $lvregel->exists($kompatible_lv);
-
-					if(!$lvregel->checkSemester($kompatible_lv, $semester))
-					{
-						$semesterlock=true;
-					}
-					else
-					{
-						if($stsem === $aktornext)
-						{
-							$result = $lvregel->isZugangsberechtigt($uid, $kompatible_lv, $stsem);
-							if((is_array($result)) && ($result[0] !== true))
-							{
-								$regelerfuellt=false;
-							}
-						}
-					}
+					// User ist noch nicht angemeldet
+					echo '<br><input type="radio" value="'.$lvid.'" name="lv"/>'.$lv->bezeichnung.' (Anmeldung bis '.$datum->formatDatum($angebot->anmeldefenster_ende,"d.m.Y").')';
 				}
-
-				if (!$semesterlock && $regelerfuellt)
+				else
 				{
-					$anzahl++;
-					// LV wird angeboten und Anmeldefenster ist offen
-
-					$bngruppe = new benutzergruppe();
-					if(!$bngruppe->load($uid, $lvangebot->result[0]->gruppe_kurzbz, $stsem))
-					{
-						// User ist noch nicht angemeldet
-						echo '<br><input type="radio" value="'.$lvid.'" name="lv"/>'.$lv->bezeichnung.' (Anmeldung bis '.$datum->formatDatum($angebot->anmeldefenster_ende,"d.m.Y").')';
-					}
-					else
-					{
-						// Bereits angemeldet
-						echo '<br><input type="radio" disabled="true" value="'.$lvid.'" name="lv" /><span class="ok">'.$lv->bezeichnung.'</span><img src="../../../skin/images/information.png" title="'.$p->t('studienplan/bereitsAngemeldet').'"/>';
-					}
+					// Bereits angemeldet
+					echo '<br><input type="radio" disabled="true" value="'.$lvid.'" name="lv" /><span class="ok">'.$lv->bezeichnung.'</span><img src="../../../skin/images/information.png" title="'.$p->t('studienplan/bereitsAngemeldet').'"/>';
 				}
 			}
 /*			else
@@ -207,9 +170,9 @@ echo '
 		$("#dialog").dialog({ autoOpen: false, width: "auto" });
 	});
 
-	function OpenAnmeldung(lehrveranstaltung_id, stsem, semester, studienplan_id)
+	function OpenAnmeldung(lehrveranstaltung_id, stsem)
 	{
-		$("#dialog").load("studienplan.php?getAnmeldung=true&lehrveranstaltung_id="+lehrveranstaltung_id+"&stsem="+stsem+"&semester="+semester+"&studienplan_id="+studienplan_id+"&uid='.$db->convert_html_chars($uid).'");
+		$("#dialog").load("studienplan.php?getAnmeldung=true&lehrveranstaltung_id="+lehrveranstaltung_id+"&stsem="+stsem+"&uid='.$db->convert_html_chars($uid).'");
 		$("#dialog").dialog("open");
 	}
 	</script>
@@ -396,7 +359,7 @@ drawTree($tree,0);
 
 function drawTree($tree, $depth)
 {
-	global $uid, $stsem_arr, $noten_arr, $lvangebot_arr, $aktornext, $studienplan_id;
+	global $uid, $stsem_arr, $noten_arr, $lvangebot_arr, $aktornext;
 	global $datum_obj, $db, $lv_arr, $p, $note_pruef_arr, $student;
 	global $anrechnung;
 
@@ -676,12 +639,12 @@ function drawTree($tree, $depth)
 						$tdclass[]='angebot';
 						if($angemeldet)
 						{
-							$tdinhalt.= '<a href="#" onclick="OpenAnmeldung(\''.$row_tree->lehrveranstaltung_id.'\',\''.$stsem.'\',\''.$semester.'\',\''.$studienplan_id.'\'); return false;"><img src="../../../skin/images/ja.png" title="'.$p->t('studienplan/legendeAngemeldet').'" /></a>';
+							$tdinhalt.= '<a href="#" onclick="OpenAnmeldung(\''.$row_tree->lehrveranstaltung_id.'\',\''.$stsem.'\'); return false;"><img src="../../../skin/images/ja.png" title="'.$p->t('studienplan/legendeAngemeldet').'" /></a>';
 						}
 						else
 						{
 							if($anmeldungmoeglich)
-								$tdinhalt.= '<a href="#" onclick="OpenAnmeldung(\''.$row_tree->lehrveranstaltung_id.'\',\''.$stsem.'\', \''.$semester.'\', \''.$studienplan_id.'\'); return false;"><img src="../../../skin/images/anmelden.png" title="'.$p->t('studienplan/anmelden').'" height="15px" /></a>';
+								$tdinhalt.= '<a href="#" onclick="OpenAnmeldung(\''.$row_tree->lehrveranstaltung_id.'\',\''.$stsem.'\'); return false;"><img src="../../../skin/images/anmelden.png" title="'.$p->t('studienplan/anmelden').'" height="15px" /></a>';
 							else
 								$tdinhalt.= '<span title="'.$anmeldeinformation.'">-</a>';
 

cis/testtool/externeueberwachung.js

@@ -1,15 +0,0 @@
-(function () {
-	function sendMessage() {
-		let frame = window.frames['content'];
-		if (frame)
-			frame.postMessage({ type: "proctoringReady" });
-	}
-
-	window.addEventListener("message", function (e)
-	{
-		if (e.data.indexOf("proctoringReady_") === 0)
-		{
-			sendMessage();
-		}
-	});
-})();

cis/testtool/frage.css

@@ -1,30 +0,0 @@
-.proctoring-blocker
-{
-	position: fixed;
-	inset: 0;
-	z-index: 99999;
-	backdrop-filter: blur(6px);
-	pointer-events: all;
-	user-select: none;
-}
-
-.proctoring-blocker.hidden
-{
-	display: none !important;
-}
-
-.proctoring-text
-{
-	position: absolute;
-	top: 50%;
-	left: 50%;
-	transform: translate(-50%, -50%);
-	color: #fff;
-	font-size: 16px;
-	font-family: sans-serif;
-}
-
-.proctoring-blur-fallback
-{
-	filter: blur(6px);
-}

cis/testtool/frage.php

@@ -45,7 +45,7 @@ if (!$db = new basis_db())
 $PHP_SELF=$_SERVER["PHP_SELF"];
 
 // Start session
-require_once './session_init.php';
+session_start();
 
 // If language is changed by language select menu, reset language variables
 if (isset($_GET['sprache_user']) && !empty($_GET['sprache_user']))
@@ -182,12 +182,6 @@ echo '
 if(!isset($_SESSION['pruefling_id']))
 	die($p->t('testtool/bitteZuerstAnmelden'));
 
-if (!empty($_SESSION['externe_ueberwachung']) && isset($_SESSION['externe_ueberwachung_verified'])): ?>
-	<link href="frage.css" rel="stylesheet" type="text/css" />
-	<script type="text/javascript" src="frage_externe_ueberwachung.js"></script>
-	<div id="proctoringBlocker" class="proctoring-blocker hidden"></div>
-<?php endif;
-
 $pruefling = new pruefling();
 $pruefling->load($_SESSION['pruefling_id']);
 

cis/testtool/frage_externe_ueberwachung.js

@@ -1,53 +0,0 @@
-(function () {
-	let ok = false;
-	let blocker;
-
-	function showBlocker() {
-		blocker = document.getElementById("proctoringBlocker");
-
-		if (!blocker)
-		{
-			blocker = document.createElement("div");
-			blocker.id = "proctoringBlocker";
-			blocker.className = "proctoring-blocker";
-			blocker.innerHTML = '<div class="proctoring-text">Loading...</div>';
-			document.body.appendChild(blocker);
-		}
-		document.documentElement.classList.add("proctoring-blur-fallback");
-	}
-
-	function block() {
-		showBlocker();
-		blocker.classList.remove("hidden");
-	}
-
-	function unblock() {
-		document.documentElement.classList.remove("proctoring-blur-fallback");
-		if (!blocker) return;
-		blocker.classList.add("hidden");
-	}
-
-	const blockTimer = setTimeout(function () {
-		if (!ok)
-			block();
-	}, 1500);
-
-	window.addEventListener("message", function (e) {
-		const data = e.data || {};
-
-		if (data.type === "proctoringReady")
-		{
-			ok = true;
-			clearTimeout(blockTimer);
-			unblock();
-		}
-	});
-
-	setTimeout(function () {
-		if (!ok) {
-			top.location.href = "resetconnection.php";
-		}
-	}, 3000);
-})();
-
-

cis/testtool/index.php

@@ -1,79 +1,16 @@
 <?php
 $contentpage = 'login.php';
 
-require_once './session_init.php';
-
 if(isset($_GET['prestudent']) && is_numeric($_GET['prestudent']))
 {
 	$contentpage = 'login.php?prestudent='.$_GET['prestudent'];
 }
-
-if ((isset($_SESSION['externe_ueberwachung']) && $_SESSION['externe_ueberwachung'] === true) &&
-	isset($_SESSION['externe_ueberwachung_verified']) && $_SESSION['externe_ueberwachung_verified'] === false)
-{
-	header("Location: resetconnection.php");
-	exit;
-}
 ?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
 <html>
 <head>
 	<title>TestTool - FH Technikum Wien</title>
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 	<link href="../../skin/style.css.php" rel="stylesheet" type="text/css">
-	<?php
-	if (!empty($_SESSION['externe_ueberwachung'])) : ?>
-	<script type="text/javascript" src="externeueberwachung.js"></script>
-	<script>
-		function loadInContent(url)
-		{
-			if (url.includes('logout=true'))
-			{
-				return doLogout(url);
-			}
-
-			let frame = document.getElementById('content_testtool');
-			if (frame)
-			{
-				frame.src = url;
-			}
-		}
-
-		function doLogout(url)
-		{
-			fetch(url)
-			let topbarFrame = window.frames['topbar'];
-			let menuFrame = window.frames['menu'];
-			let contentFrame = window.frames['content'];
-
-			if (contentFrame)
-				contentFrame.location.href = 'logout.html';
-
-			if (menuFrame)
-				menuFrame.location.href = menuFrame.location.pathname;
-
-			if (topbarFrame)
-				topbarFrame.location.href = topbarFrame.location.pathname;
-			return false;
-		}
-
-		function changeSprache(content_params, sprache)
-		{
-			let topbarFrame = window.frames['topbar'];
-			let menuFrame = window.frames['menu'];
-			let contentFrame = window.frames['content'];
-
-			if (topbarFrame)
-				topbarFrame.location.href = topbarFrame.location.pathname + '?sprache_user=' + sprache;
-
-			if (menuFrame)
-				menuFrame.location.href = menuFrame.location.pathname + '?sprache_user=' + sprache;
-
-			if (contentFrame)
-				contentFrame.location.href = contentFrame.location.pathname + '?' + content_params;
-		}
-
-	</script>
-	<?php endif; ?>
 </head>
 
 <frameset rows="13%,*" cols="*" frameborder="NO" border="0" framespacing="0">
@@ -89,4 +26,3 @@ if ((isset($_SESSION['externe_ueberwachung']) && $_SESSION['externe_ueberwachung
 	</noframes>
 </frameset>
 </html>
-

cis/testtool/login.php

@@ -40,7 +40,8 @@ if (!$db = new basis_db())
 	die('Fehler beim Oeffnen der Datenbankverbindung');
 
 // Start session
-require_once './session_init.php';
+session_start();
+
 // Logout (triggered by logout button in menu.php)
 if (isset($_GET['logout']) && $_GET['logout'] == true)
 {
@@ -172,12 +173,6 @@ if (isset($_REQUEST['prestudent']))
 						else
 							$reload_menu = true;
 					}
-
-					if ($rt->externe_ueberwachung && defined('TESTTOOL_EXTERNE_UEBERWACHUNG_ALLOWED') && TESTTOOL_EXTERNE_UEBERWACHUNG_ALLOWED)
-					{
-						$_SESSION['externe_ueberwachung'] = true;
-						$_SESSION['externe_ueberwachung_verified'] = false;
-					}
 				}
 
 				$pruefling = new pruefling();
@@ -344,8 +339,6 @@ if ((isset($_SESSION['prestudent_id']) && !isset($_SESSION['pruefling_id']) &&
 	!isset($_SESSION['confirmation_needed']) && !isset($_SESSION['confirmed_code'])) ||
 	(isset($_SESSION['confirmation_needed']) && $_SESSION['confirmation_needed'] === true &&
 	isset($_SESSION['confirmed_code']) && $_SESSION['confirmed_code'] === true &&
-	isset($_SESSION['externe_ueberwachung']) && $_SESSION['externe_ueberwachung'] === true &&
-	isset($_SESSION['externe_ueberwachung_verified']) && $_SESSION['externe_ueberwachung_verified'] === true &&
 	isset($_SESSION['prestudent_id']) && !isset($_SESSION['pruefling_id'])))
 {
 	$pruefling = new pruefling();
@@ -454,6 +447,14 @@ if (isset($_POST['save']) && isset($_SESSION['prestudent_id']))
 		{
 			e.preventDefault();
 		});
+		// If Browser is any other than Mozilla Firefox and the test includes any MathML,
+		// show message to use Mozilla Firefox
+		var ua = navigator.userAgent;
+		if ((ua.indexOf("Firefox") > -1) == false)
+		{
+			$("#alertmsgdiv").html("<div class='alert alert-danger'>BITTE VERWENDEN SIE DEN MOZILLA FIREFOX BROWSER!<br>(Manche Prüfungsfragen werden sonst nicht korrekt dargestellt.<br><br>PLEASE USE MOZILLA FIREFOX BROWSER!<br>(Otherwise some exam items will not be displayed correctly</div>");
+			//alert('BITTE VERWENDEN SIE DEN MOZILLA FIREFOX BROWSER!\n(Manche Prüfungsfragen werden sonst nicht korrekt dargestellt.\n\nPLEASE USE MOZILLA FIREFOX BROWSER!\n(Ohterwise some exam items will not be displayed correctly.)');
+		}
 	});
 	</script>
 <?php
@@ -467,13 +468,7 @@ if (isset($_POST['save']) && isset($_SESSION['prestudent_id']))
 
 <?php
 
-if ((isset($_SESSION['externe_ueberwachung']) && $_SESSION['externe_ueberwachung'] === true) &&
-	isset($_SESSION['externe_ueberwachung_verified']) && $_SESSION['externe_ueberwachung_verified'] === false)
-{
-	echo "<script> top.location.href = 'resetconnection.php';</script>";
-	exit;
-}
-else if (isset($_SESSION['confirmation_needed']) && $_SESSION['confirmation_needed'] === true &&
+if (isset($_SESSION['confirmation_needed']) && $_SESSION['confirmation_needed'] === true &&
 	isset($_SESSION['confirmed_code']) && $_SESSION['confirmed_code'] === false)
 {
 	echo '
@@ -731,7 +726,7 @@ else // LOGIN Site (vor Login)
 			echo '<script>
 				function changeconfirmation()
 				{
-					document.getElementById("confirmationSubmit").disabled = !document.getElementById("confirmationCheckbox").checked || !document.getElementById("dsgvoconfirm").checked || !document.getElementById("procotoringconfirm").checked;
+					document.getElementById("confirmationSubmit").disabled = !document.getElementById("confirmationCheckbox").checked;
 				}
 				</script>';
 			echo '<div class="row text-center">
@@ -741,12 +736,6 @@ else // LOGIN Site (vor Login)
 			<input id="confirmationCheckbox" type="checkbox" name="confirmation" onclick="changeconfirmation()" />
 			'.$p->t('testtool/confirmationText').'
 			<br><br>
-			<input id="dsgvoconfirm" type="checkbox" name="confirmation" onclick="changeconfirmation()" />
-			'.$p->t('testtool/dsgvoConfirmText').'
-			<br><br>
-			<input id="procotoringconfirm" type="checkbox" name="confirmation" onclick="changeconfirmation()" />
-			'.$p->t('testtool/procotoringConfirmText').'
-			<br><br>
 			<button id="confirmationSubmit" type="submit" class="btn btn-primary" disabled/>
 				'.$p->t('testtool/start').'
 			</button>

cis/testtool/menu.php

@@ -34,7 +34,7 @@ if (!$db = new basis_db())
 	die('Fehler beim Oeffnen der Datenbankverbindung');
 
 // Start session
-require_once './session_init.php';
+session_start();
 
 // If language is changed by language select menu, reset language and session variables
 if(isset($_GET['sprache_user']) && !empty($_GET['sprache_user']))
@@ -61,12 +61,8 @@ $p = new phrasen($sprache_user);
 <?php
 $gebiet_hasMathML = false; // true, wenn irgendein Gebiet eine/n Frage/Vorschlag im MathML-Format enthält
 $invalid_gebiete = false;
-if ((isset($_SESSION['externe_ueberwachung']) && $_SESSION['externe_ueberwachung'] === true) &&
-	isset($_SESSION['externe_ueberwachung_verified']) && $_SESSION['externe_ueberwachung_verified'] === false)
-{
-	exit;
-}
-else if (isset($_SESSION['pruefling_id']))
+
+if (isset($_SESSION['pruefling_id']))
 {
 	//content_id fuer Einfuehrung auslesen
 	$qry = "SELECT content_id FROM testtool.tbl_ablauf_vorgaben WHERE studiengang_kz=".$db->db_add_param($_SESSION['studiengang_kz'])." LIMIT 1";
@@ -77,7 +73,7 @@ else if (isset($_SESSION['pruefling_id']))
 
 // Link zur Startseite
 	echo '<tr><td class="ItemTesttool" style="margin-left: 20px;" nowrap>
-			<a class="ItemTesttool navButton" href="login.php" onclick="return loadContent(this.href);">'.$p->t('testtool/startseite').'</a>
+			<a class="ItemTesttool navButton" href="login.php" target="content">'.$p->t('testtool/startseite').'</a>
 		</td></tr>';
 
 // Link zur Einleitung
@@ -87,7 +83,7 @@ else if (isset($_SESSION['pruefling_id']))
 		{
 			echo '
 				<tr id="tr-einleitung"><td class="ItemTesttool" style="margin-left: 20px;" nowrap>
-					<a class="ItemTesttool navButton" href="../../cms/content.php?content_id='.$content_id->content_id.'&sprache='.$sprache_user.'" onclick="return loadContent(this.href);">'.$p->t('testtool/einleitung').'</a>
+					<a class="ItemTesttool navButton" href="../../cms/content.php?content_id='.$content_id->content_id.'&sprache='.$sprache_user.'" target="content">'.$p->t('testtool/einleitung').'</a>
 				</td></tr>
 			';
 		}
@@ -383,13 +379,10 @@ else if (isset($_SESSION['pruefling_id']))
 				}
 			}
 
-
 			echo '<tr>
 					<!--<td width="10" class="ItemTesttoolLeft" nowrap>&nbsp;</td>-->
-
 						<td class="'.$class.'">
-								<a class="'.$class.'" href="frage.php?gebiet_id='.$row->gebiet_id.'" onclick="return loadContent(this.href);"  style="'.$style.'">'.$gebietbezeichnung.'</a>
-								
+							<a class="'.$class.'" href="frage.php?gebiet_id='.$row->gebiet_id.'" onclick="document.location.reload()" target="content" style="'.$style.'">'.$gebietbezeichnung.'</a>
 						</td>
 					<!--<td width="10" class="ItemTesttoolRight" nowrap>&nbsp;</td>-->
 					</tr>';
@@ -408,7 +401,7 @@ else if (isset($_SESSION['pruefling_id']))
 	// Link zum Logout
 
 	echo '<tr><td class="ItemTesttool" style="margin-left: 20px;" nowrap>
-			<a class="ItemTesttool navButton" href="login.php?logout=true" onclick="return loadContent(this.href);">Logout</a>
+			<a class="ItemTesttool navButton" href="login.php?logout=true" target="content">Logout</a>
 		</td></tr>';
 
 	echo '</td></tr></table>';
@@ -432,6 +425,28 @@ else
 			e.preventDefault();
 		});
 	});
+    // Get users Browser
+    var ua = navigator.userAgent;
+
+    // If Browser is any other than Mozilla Firefox and the test includes any MathML,
+    // show message to use Mozilla Firefox
+    if ((ua.indexOf("Firefox") > -1) == false)
+    {
+        let hasMathML = "<?php echo (isset($gebiet_hasMathML)?$gebiet_hasMathML:''); ?>";
+        let userLang = "<?php echo $sprache_user; ?>";
+        if (hasMathML == true)
+        {
+            if (userLang == 'German')
+            {
+                alert('BITTE VERWENDEN SIE DEN MOZILLA FIREFOX BROWSER!\n(Manche Prüfungsfragen werden sonst nicht korrekt dargestellt.)');
+            }
+            else if(userLang == 'English')
+            {
+                alert('PLEASE USE MOZILLA FIREFOX BROWSER!\n(Ohterwise some exam items will not be displayed correctly.)');
+            }
+        }
+    }
+
     // Error massage if check_gebiet function returns false
     $(function() {
         var invalid_gebiete = "<?php echo (isset($invalid_gebiete)?$invalid_gebiete:''); ?>";
@@ -446,22 +461,5 @@ else
                 '</td></tr>');
         }
     });
-
-	function loadContent(url)
-	{
-		if (parent && typeof parent.loadInContent === 'function')
-		{
-			parent.loadInContent(url);
-			return false;
-		}
-
-		let frame = parent?.frames?.["content"];
-		if (frame)
-		{
-			frame.location.href = url;
-			return false;
-		}
-	}
-
 </script>
 </html>

cis/testtool/resetconnection.php

@@ -1,18 +0,0 @@
-<?php
-
-
-require_once './session_init.php';
-
-require_once('../../config/cis.config.inc.php');
-require_once('../../config/global.config.inc.php');
-require_once '../../include/externe_ueberwachung.class.php';
-if (!$db = new basis_db())
-	die('Fehler beim Oeffnen der Datenbankverbindung');
-if ((defined('TESTTOOL_EXTERNE_UEBERWACHUNG_ALLOWED') && TESTTOOL_EXTERNE_UEBERWACHUNG_ALLOWED) && isset($_SESSION['externe_ueberwachung']) && $_SESSION['externe_ueberwachung'] === true)
-{
-	$ueberwachung = new externeUeberwachung();
-	$url = $ueberwachung->start($_SESSION['prestudent_id'], $_SESSION['reihungstestID'], $_SESSION['sprache']);
-	$urlSafe = htmlspecialchars($url, ENT_QUOTES);
-	header("Location: $urlSafe");
-	$_SESSION['externe_ueberwachung_verified'] = true;
-}

cis/testtool/session_init.php

@@ -1,11 +0,0 @@
-<?php
-if (session_status() === PHP_SESSION_NONE) {
-	session_set_cookie_params(
-		0,
-		'/; samesite=None',
-		'',
-		true,
-		true
-	);
-	session_start();
-}

cis/testtool/topbar.php

@@ -67,17 +67,9 @@ function changeSprache(sprache)
     content_params.set('sprache_user', sprache); // add or replace sprache_user
 
     // Pass GET-param sprache_user to topbar.php, menu.php and content (login.php or frage.php) and refresh the frames.
-	if (parent && typeof parent.changeSprache === 'function')
-	{
-		parent.changeSprache(content_params, sprache);
-		return false;
-	}
-	else
-	{
-		location.href = location.pathname + '?sprache_user=' + sprache; // refreshes topbar.php
-		parent.menu.location.href = parent.menu.location.pathname + '?sprache_user=' + sprache; // refreshes menu.php
-		parent.content.location.href = parent.content.location.pathname + '?' + content_params; // refreshes login.php or frage.php
-	}
+    location.href = location.pathname + '?sprache_user=' + sprache; // refreshes topbar.php
+    parent.menu.location.href = parent.menu.location.pathname + '?sprache_user=' + sprache; // refreshes menu.php
+    parent.content.location.href = parent.content.location.pathname + '?' + content_params; // refreshes login.php or frage.php
 }
 
 	$(document).on("keydown", function (e) {

composer.json

@@ -456,7 +456,6 @@
 		"fortawesome/font-awesome4": "4.7.*",
 		"fortawesome/font-awesome6": "6.1.*",
 		"fzaninotto/faker": "1.*",
-		"firebase/php-jwt": "^6.0",
 
 		"highcharts/highcharts-dist": "^7.1.2",
 

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "f4f0af4586f46f97d8b6092c1ac0fb3a",
+    "content-hash": "1de37a74ba51a66057eb2712b21340c8",
     "packages": [
         {
             "name": "afarkas/html5shiv",
@@ -882,63 +882,6 @@
             },
             "type": "library"
         },
-        {
-            "name": "firebase/php-jwt",
-            "version": "v6.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/firebase/php-jwt.git",
-                "reference": "0541cba75ab108ef901985e68055a92646c73534"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/firebase/php-jwt/zipball/0541cba75ab108ef901985e68055a92646c73534",
-                "reference": "0541cba75ab108ef901985e68055a92646c73534",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": ">=4.8 <=9"
-            },
-            "suggest": {
-                "paragonie/sodium_compat": "Support EdDSA (Ed25519) signatures when libsodium is not present"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Firebase\\JWT\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Neuman Vong",
-                    "email": "neuman+pear@twilio.com",
-                    "role": "Developer"
-                },
-                {
-                    "name": "Anant Narayanan",
-                    "email": "anant@php.net",
-                    "role": "Developer"
-                }
-            ],
-            "description": "A simple library to encode and decode JSON Web Tokens (JWT) in PHP. Should conform to the current spec.",
-            "homepage": "https://github.com/firebase/php-jwt",
-            "keywords": [
-                "jwt",
-                "php"
-            ],
-            "support": {
-                "issues": "https://github.com/firebase/php-jwt/issues",
-                "source": "https://github.com/firebase/php-jwt/tree/v6.0.0"
-            },
-            "time": "2022-01-24T15:18:34+00:00"
-        },
         {
             "name": "fortawesome/font-awesome4",
             "version": "4.7.0",