add status

application/components/filters/Vertragsverwaltung.php

@@ -1,36 +0,0 @@
-<?php
-$filterCmptArray = array(
-	"app" => 'core',
-	'datasetName' => 'vertragsverwaltung',
-	'query' =>  '
-		SELECT
-			uid,
-			person_id,
-			vorname,
-			nachname,
-			gebdatum,
-			vertragsarten,
-			unternehmen,
-			ids,
-			aktiv
-		FROM
-			(
-			SELECT
-				b.uid , p.person_id,
-				p.vorname, p.nachname,
-				gebdatum,
-				STRING_AGG(DISTINCT va.bezeichnung, \', \') AS Vertragsarten,
-				STRING_AGG(DISTINCT u.bezeichnung, \', \') AS Unternehmen,
-				STRING_AGG(d.dienstverhaeltnis_id::TEXT, \', \') AS ids,
-				b.aktiv
-			FROM
-				hr.tbl_dienstverhaeltnis d
-				JOIN public.tbl_benutzer b ON d.mitarbeiter_uid = b.uid
-				JOIN public.tbl_person p ON p.person_id = b.person_id
-				JOIN public.tbl_organisationseinheit u ON d.oe_kurzbz = u.oe_kurzbz
-				JOIN hr.tbl_vertragsart va ON d.vertragsart_kurzbz = va.vertragsart_kurzbz
-			GROUP BY b.uid, p.person_id, p.vorname, p.nachname, b.aktiv
-			) as vertragsdaten
-		',
-	'requiredPermissions' => 'vertrag/mitarbeiter'
-	);

application/config/navigation.php

@@ -163,13 +163,6 @@ $config['navigation_header'] = array(
 					'expand' => true,
 					'sort' => 50,
 					'requiredPermissions' => 'lehre/gruppenmanager:r'
-				),
-				'vertragsverwaltung' => array(
-					'link' => site_url('vertragsverwaltung'),
-					'description' => 'Vertragsverwaltung',
-					'expand' => true,
-					'sort' => 51,
-					'requiredPermissions' => 'vertrag/mitarbeiter:r'
 				)
 			)
 		),
@@ -342,18 +335,6 @@ $config['navigation_menu']['system/issues/Issues/*'] = array(
 		'target' => '_blank',
 		'requiredPermissions' => array('admin:rw')
 	),
-
-);
-
-$config['navigation_menu']['vertragsverwaltung/*'] = array(
-	'vertragsverwaltung' => array(
-		'link' => site_url('vertragsverwaltung'),
-		'description' => 'Vertragsverwaltung',
-		'icon' => 'home',
-		'sort' => 100,
-		'target' => '_blank',
-		'requiredPermissions' => array('vertrag/mitarbeiter:r')
-	)
 );
 
 $config['navigation_menu']['apps'] = [

application/config/stv.php

@@ -130,16 +130,3 @@ $config['students_tab_order'] = [
 	'combinePeople',
 	'archive',
 ];
-
-$config['stv_prestudent_tags'] = [
-	'prioone' => ['readonly' => false],
-	'priotwo' => ['readonly' => true],
-	'hinweis' => ['readonly' => false],
-	'hinweis_assistenz' => ['readonly' => true],
-	'hinweis_kf' => ['readonly' => true],
-	'hinweis_lehrende' => ['readonly' => false],
-	'hinweis_stg_kf' => ['readonly' => true],
-	'finished_stg' => ['readonly' => true],
-	'finished_kf' => ['readonly' => true],
-	'inwork_kf' => ['readonly' => true],
-];

application/controllers/Cis/MyLv.php

@@ -33,4 +33,9 @@ class MyLv extends Auth_Controller
 
 		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'MyLv']);
 	}
+
+	public function Info($studien_semester,$lvid)
+	{
+		$this->load->view('Cis/LvInfo',['lvid'=> $lvid, 'studien_semester' => $studien_semester]);
+	}
 }

application/controllers/Studentenverwaltung.php

@@ -28,7 +28,7 @@ class Studentenverwaltung extends Auth_Controller
 				'basis/prestudentstatus' => $this->permissionlib->isBerechtigt('basis/prestudentstatus'),
 				'assistenz_stgs' => $this->permissionlib->getSTG_isEntitledFor('assistenz'),
 				'admin' => $this->permissionlib->isBerechtigt('admin'),
-				'assistenz_schreibrechte' => $this->permissionlib->isBerechtigt('assistenz', 'suid'),
+				'assistenz_schreibrechte' => $this->permissionlib->isBerechtigt('assistenz','suid'),
 				'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'),
@@ -43,5 +43,3 @@ class Studentenverwaltung extends Auth_Controller
 		]);
 	}
 }
-
-

application/controllers/Vertragsverwaltung.php

@@ -1,30 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-class Vertragsverwaltung extends Auth_Controller
-{
-	public function __construct()
-	{
-		$permissions = [];
-		$router = load_class('Router');
-		$permissions[$router->method] = ['vertrag/mitarbeiter:r'];
-		#$permissions[$router->method] = ['admin:rw'];
-		parent::__construct($permissions);
-
-		// Load Libraries
-		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
-	}
-
-	/**
-	 * @return void
-	 */
-	public function _remap()
-	{
-		$this->load->view('Vertragsverwaltung', [
-			'permissions' => [
-				'vertragsverwaltung_schreibrechte' => $this->permissionlib->isBerechtigt('vertrag/mitarbeiter', 'suid')
-			]
-		]);
-	}
-}

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

@@ -511,11 +511,10 @@ class Abgabe extends FHCAPI_Controller
 			return $projektarbeit->projektarbeit_id;
 		};
 		$projektarbeiten_ids = array_map($mapFunc, $projektarbeiten->retval);
+
+		$ret = $this->ProjektarbeitModel->getProjektarbeitenAbgabetermine($projektarbeiten_ids);
+		$projektabgaben = $this->getDataOrTerminateWithError($ret, 'general');
 		
-		if(count($projektarbeiten_ids) > 0) {
-			$ret = $this->ProjektarbeitModel->getProjektarbeitenAbgabetermine($projektarbeiten_ids);
-			$projektabgaben = $this->getDataOrTerminateWithError($ret, 'general');
-		}
 		
 		forEach($projektarbeiten->retval as $pa) {
 			
@@ -847,10 +846,9 @@ class Abgabe extends FHCAPI_Controller
 	private function getProjektbetreuerEmailByProjektarbeitID($projektarbeit_id) {
 		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
 		$result = $this->ProjektarbeitModel->getProjektbetreuerEmail($projektarbeit_id);
-		if(count($result->retval) > 0) {
-			$email = getData($result);
-			return $email[0]->uid ? $email[0]->uid.'@'.DOMAIN : $email[0]->private_email;
-		} else return '';
+		$email = $this->getDataOrTerminateWithError($result, 'general');
+		
+		return $email[0]->uid ? $email[0]->uid.'@'.DOMAIN : $email[0]->private_email;
 
 	}
 

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

@@ -208,6 +208,7 @@ class Documents extends FHCAPI_Controller
 		$this->load->model('system/Vorlage_model', 'VorlageModel');
 
 		$result = $this->VorlageModel->load($xsl);
+		$this->addMeta("ress", $result);
 		$vorlage = current($this->getDataOrTerminateWithError($result));
 		if (!$vorlage)
 			show_404();
@@ -220,7 +221,7 @@ class Documents extends FHCAPI_Controller
 			'gedruckt' => true,
 			'insertamum' => date('c'),
 			'insertvon' => getAuthUID(),
-			'uid' => $this->input->post_get('uid') ?: null,
+			'uid' => $this->input->post_get('uid') ?: '',
 			'archiv' => true,
 			'signiert' => !!$sign_user,
 			'stud_selfservice' => $vorlage->stud_selfservice
@@ -250,9 +251,6 @@ class Documents extends FHCAPI_Controller
 					'studiensemester_kurzbz' => $ss,
 					'student_uid' => $akteData['uid']
 				]);
-
-				if (!hasData($result)) $this->terminateWithError($this->p->t("stv", "error_noLehrverbandAssigned"));
-
 				$res = current($this->getDataOrTerminateWithError($result));
 
 				$studiengang_kz = $res->studiengang_kz;
@@ -334,7 +332,6 @@ class Documents extends FHCAPI_Controller
 			if ($prestudent_id) {
 				$this->load->model('crm/prestudent_model', 'PrestudentModel');
 				$this->PrestudentModel->addJoin('public.tbl_studiengang', 'studiengang_kz', 'LEFT');
-				$this->PrestudentModel->addSelect('tbl_prestudent.*, UPPER(typ || kurzbz) AS kuerzel');
 				$result = $this->PrestudentModel->load($prestudent_id);
 				$prestudent = current($this->getDataOrTerminateWithError($result));
 

application/controllers/api/frontend/v1/detailheader/Detailheader.php

@@ -1,53 +0,0 @@
-<?php
-
-if (!defined('BASEPATH')) exit('No direct script access allowed');
-
-use \DateTime as DateTime;
-
-class Detailheader extends FHCAPI_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'getHeader' => ['vertrag/mitarbeiter:r'],
-			'getPersonAbteilung' => ['vertrag/mitarbeiter:r'],
-			'getLeitungOrg' => ['vertrag/mitarbeiter:r'],
-		]);
-	}
-
-	public function getHeader($person_id)
-	{
-		$this->load->model('ressource/Mitarbeiter_model', 'Mitarbeitermodel');
-
-		$result = $this->Mitarbeitermodel->getHeader($person_id);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess(current($data));
-	}
-
-	public function getPersonAbteilung($mitarbeiter_uid)
-	{
-		$this->load->model('ressource/Mitarbeiter_model', 'Mitarbeitermodel');
-
-		$result = $this->Mitarbeitermodel->getPersonAbteilung($mitarbeiter_uid);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess(current($data));
-	}
-
-	public function getLeitungOrg($oekurzbz)
-	{
-		$this->load->model('ressource/Mitarbeiter_model', 'Mitarbeitermodel');
-
-		$result = $this->Mitarbeitermodel->getLeitungOrg($oekurzbz);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess(current($data));
-	}
-
-}
-
-

application/controllers/api/frontend/v1/fotoHandling/Foto.php

@@ -1,237 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-use \DateTime as DateTime;
-
-class Foto extends  FHCAPI_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'uploadFoto' => ['admin:r', 'assistenz:r'],
-			'deleteFoto' => ['admin:r', 'assistenz:r'],
-		]);
-
-		//Load Models and Libraries
-		$this->load->model('person/Person_model', 'PersonModel');
-		$this->load->model("crm/Akte_model", "AkteModel");
-		$this->load->model('person/Fotostatusperson_model', 'FotostatusPersonModel');
-
-		$this->loadPhrases([
-			'ui',
-			'header'
-		]);
-	}
-
-	public function uploadFoto($person_id)
-	{
-		if(!$person_id)
-		{
-			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Person_id']), self::ERROR_TYPE_GENERAL);
-		}
-
-		$data = json_decode(file_get_contents("php://input"), true);
-
-		if (!empty($data['image']))
-		{
-			$base64 = $data['image'];
-			$resizedImage1 = $this->_resize($base64, 827, 1063);
-
-			if (is_null($resizedImage1))
-				return $this->terminateWithError($this->p->t('header', 'error_fotoupload'), self::ERROR_TYPE_GENERAL);
-
-			$akte = $this->AkteModel->loadWhere(array('person_id' => $person_id, 'dokument_kurzbz' => 'Lichtbil'));
-
-			$akteUpdateData = array(
-				'dokument_kurzbz' => 'Lichtbil',
-				'person_id' => $person_id,
-				'inhalt' => $resizedImage1,
-				'mimetype' => 'image/jpg',
-				'erstelltam' => date('c'),
-				'gedruckt' => false,
-				'titel' => 'Lichtbild_' . $person_id . '.jpg',
-				'bezeichnung' => 'Lichtbild gross',
-				'insertamum' => date('c'),
-				'insertvon' => getAuthUID(),
-			);
-
-			if (hasData($akte)) {
-				$akte_id = getData($akte)[0]->akte_id;
-
-				$akteUpdateData['updateamum'] = date('c');
-				$akteUpdateData['updatevon'] = getAuthUID();
-				$akteResult = $this->AkteModel->update(array('akte_id' => $akte_id), $akteUpdateData);
-			} else {
-				$akteResult = $this->AkteModel->insert($akteUpdateData);
-			}
-
-			if (isError($akteResult)) {
-				return $this->terminateWithError(getError($akteResult), self::ERROR_TYPE_GENERAL);
-			}
-
-			$resizedImage2 = $this->_resize($base64, 101, 130);
-
-			if (is_null($resizedImage2))
-				return $this->terminateWithError($this->p->t('header', 'error_fotoupload'), self::ERROR_TYPE_GENERAL);
-
-			$result = $this->_updateFoto($person_id, $resizedImage2);
-
-			if (!isError($result)) {
-				$this->FotostatusPersonModel->insert(array(
-					'person_id' => $person_id,
-					'fotostatus_kurzbz' => 'hochgeladen',
-					'datum' => date('Y-m-d'),
-					'updateamum' => date('c'),
-					'updatevon' => getAuthUID(),
-					'insertamum' => date('c'),
-					'insertvon' => getAuthUID(),
-				));
-
-				return $this->terminateWithSuccess($base64);
-			}
-		}
-		else
-		{
-			$this->terminateWithError($this->p->t('header', 'error_noPhoto'), self::ERROR_TYPE_GENERAL);
-		}
-	}
-
-	public function deleteFoto($person_id)
-	{
-		if(!$person_id)
-		{
-			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Person_id']), self::ERROR_TYPE_GENERAL);
-		}
-
-		$result = $this->_deleteFoto($person_id);
-
-		if (isError($result))
-		{
-			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
-		}
-		return $this->terminateWithSuccess($result);
-	}
-
-	private function _resize($imageData, $maxwidth, $maxheight, $quality = 90)
-	{
-		$meta = getimagesize($imageData);
-		if (!$meta)
-		{
-			return null;
-		}
-
-		$src_width = $meta[0];
-		$src_height = $meta[1];
-		$mime = $meta['mime'];
-
-		switch ($mime) {
-			case 'image/jpeg':
-			case 'image/jpg':
-				$imagecreated = imagecreatefromjpeg($imageData);
-				break;
-			case 'image/png':
-				$imagecreated = imagecreatefrompng($imageData);
-				break;
-			case 'image/gif':
-				$imagecreated = imagecreatefromgif($imageData);
-				break;
-			default:
-				return null;
-		}
-
-
-		if (!$imagecreated)
-		{
-			return null;
-		}
-
-		$src_aspect_ratio = $src_width / $src_height;
-		$thu_aspect_ratio = $maxwidth / $maxheight;
-
-		if ($src_width <= $maxwidth && $src_height <= $maxheight)
-		{
-			$thu_width = $src_width;
-			$thu_height = $src_height;
-		}
-		elseif ($thu_aspect_ratio > $src_aspect_ratio)
-		{
-			$thu_width = (int) ($maxheight * $src_aspect_ratio);
-			$thu_height = $maxheight;
-		}
-		else
-		{
-			$thu_width = $maxwidth;
-			$thu_height = (int) ($maxwidth / $src_aspect_ratio);
-		}
-
-		$imageScaled = imagecreatetruecolor($thu_width, $thu_height);
-
-		if ($mime === 'image/png')
-		{
-			$background = imagecolorallocate($imageScaled , 0, 0, 0);
-			imagecolortransparent($imageScaled, $background);
-			imagealphablending($imageScaled, false);
-			imagesavealpha($imageScaled, true);
-		}
-
-		imagecopyresampled($imageScaled, $imagecreated, 0, 0, 0, 0, $thu_width, $thu_height, $src_width, $src_height);
-
-		if ($mime === "image/gif")
-		{
-			$background = imagecolorallocate($imageScaled, 0, 0, 0);
-			imagecolortransparent($imageScaled, $background);
-		}
-
-		if (!empty($imageScaled))
-		{
-			ob_start();
-
-			if ($mime == 'image/png')
-				imagepng($imageScaled, NULL);
-			else if ($mime === 'image/gif')
-				imagegif($imageScaled, NULL);
-			else
-				imagejpeg($imageScaled, NULL, $quality);
-
-			$resizedImageData = ob_get_contents();
-			ob_end_clean();
-			@imagedestroy($imagecreated);
-			@imagedestroy($imageScaled);
-
-
-			if (!empty($resizedImageData))
-			{
-				return base64_encode($resizedImageData);
-			}
-			return null;
-		}
-		return null;
-	}
-
-	private function _updateFoto($person_id, $foto)
-	{
-		$personJson['foto'] = $foto;
-		$result = $this->PersonModel->update($person_id, $personJson);
-
-		if (isError($result))
-		{
-			return error($result->msg, EXIT_ERROR);
-		}
-
-		return $result;
-	}
-
-	private function _deleteFoto($person_id)
-	{
-		$personJson['foto'] = null;
-		$result = $this->PersonModel->update($person_id, $personJson);
-
-		if (isError($result))
-		{
-			return error($result->msg, EXIT_ERROR);
-		}
-
-		return $result;
-	}
-}

application/controllers/api/frontend/v1/notiz/NotizAnrechnung.php

@@ -1,44 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-use \DateTime as DateTime;
-
-class NotizAnrechnung extends Notiz_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'isBerechtigt' => ['admin:r', 'assistenz:r'],
-		]);
-
-		//Load Models
-		$this->load->model('person/Notiz_model', 'NotizModel');
-		$this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
-
-		// Load Libraries
-		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
-
-		// Load language phrases
-		$this->loadPhrases([
-			'ui'
-		]);
-	}
-
-	public function isBerechtigt($id, $typeId)
-	{
-		if($typeId != "anrechnung_id")
-		{
-			$this->terminateWithError($this->p->t('ui','error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
-		}
-
-		//TODO define permission
-		if(!$this->permissionlib->isBerechtigt('admin', 'suid') && !$this->permissionlib->isBerechtigt('assistenz', 'suid'))
-		{
-			$result =  $this->p->t('lehre','error_keineSchreibrechte');
-
-			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
-		$this->terminateWithSuccess("berechtigt in überschreibender Funktion");
-	}
-}

application/controllers/api/frontend/v1/notiz/NotizBestellung.php

@@ -1,43 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-use \DateTime as DateTime;
-
-class NotizBestellung extends Notiz_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'isBerechtigt' => ['admin:r', 'assistenz:r'],
-		]);
-
-		//Load Models
-		$this->load->model('person/Notiz_model', 'NotizModel');
-		$this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
-
-		// Load Libraries
-		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
-
-		// Load language phrases
-		$this->loadPhrases([
-			'ui'
-		]);
-	}
-
-	public function isBerechtigt($id, $typeId)
-	{
-		if($typeId != "bestellung_id")
-		{
-			$this->terminateWithError($this->p->t('ui','error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
-		}
-		//TODO define permission
-		if(!$this->permissionlib->isBerechtigt('admin', 'suid') && !$this->permissionlib->isBerechtigt('assistenz', 'suid'))
-		{
-			$result =  $this->p->t('lehre','error_keineSchreibrechte');
-
-			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
-		$this->terminateWithSuccess("berechtigt in überschreibender Funktion");
-	}
-}

application/controllers/api/frontend/v1/notiz/NotizLehreinheit.php

@@ -17,106 +17,5 @@ class NotizLehreinheit extends Notiz_Controller
 			'getMitarbeiter' => ['admin:r', 'assistenz:r'],
 			'isBerechtigt' => ['admin:r', 'assistenz:r'],
 		]);
-
-		//Load Models
-		$this->load->model('person/Notiz_model', 'NotizModel');
-		$this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
-		$this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
-
-		// Load Libraries
-		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
-
-		//Permission checks for allowed Oes
-		$allowedOes = $this->permissionlib->getOE_isEntitledFor('assistenz') ?: [];
-
-		if ($this->router->method == 'addNewNotiz')
-		{
-			$json = $this->input->post('data');
-			$post_data = json_decode($json, true);
-			$lehreinheit_id = $post_data['id'];
-
-			if(!$lehreinheit_id)
-			{
-				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Lehreinheit ID']), self::ERROR_TYPE_GENERAL);
-			}
-			$this->_checkAllowedOesFromLehreinheit($lehreinheit_id, $allowedOes);
-		}
-
-		if ($this->router->method == 'updateNotiz')
-		{
-			$json = $this->input->post('data');
-			$post_data = json_decode($json, true);
-			$notiz_id = $post_data['notiz_id'];
-
-			if(!$notiz_id)
-			{
-				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Notiz ID']), self::ERROR_TYPE_GENERAL);
-			}
-
-			//get lehreinheit_id
-			$result = $this->NotizzuordnungModel->loadWhere(['notiz_id' => $notiz_id]);
-
-			$data = $this->getDataOrTerminateWithError($result);
-			$lehreinheit_id = current($data)->lehreinheit_id;
-
-			if(!$lehreinheit_id)
-			{
-				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Lehreinheit ID']), self::ERROR_TYPE_GENERAL);
-			}
-			$this->_checkAllowedOesFromLehreinheit($lehreinheit_id, $allowedOes);
-		}
-
-		if ($this->router->method == 'deleteNotiz')
-		{
-			$notiz_id = $this->input->post('notiz_id');
-			$lehreinheit_id = $this->input->post('id');
-
-			if(!$notiz_id)
-			{
-				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Notiz ID']), self::ERROR_TYPE_GENERAL);
-			}
-
-			if(!$lehreinheit_id)
-			{
-				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Lehreinheit ID']), self::ERROR_TYPE_GENERAL);
-			}
-			$this->_checkAllowedOesFromLehreinheit($lehreinheit_id, $allowedOes);
-		}
-
-		// Load language phrases
-		$this->loadPhrases([
-			'ui'
-		]);
 	}
-
-	private function _checkAllowedOesFromLehreinheit($lehreinheit_id, $allowedOes)
-	{
-		//get oe from lehreinheit
-		$result = $this->LehreinheitModel->getOes($lehreinheit_id);
-		$data = $this->getDataOrTerminateWithError($result);
-		$oes = current($data);
-
-		if (!in_array($oes, $allowedOes))
-		{
-			return $this->terminateWithError($this->p->t('ui', 'error_keineBerechtigungStg') . " " . $oes, self::ERROR_TYPE_GENERAL);
-		}
-	}
-
-	public function isBerechtigt($id, $typeId)
-	{
-			if($typeId != "lehreinheit_id")
-		{
-			$this->terminateWithError($this->p->t('ui','error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
-		}
-
-		if(!$this->permissionlib->isBerechtigt('admin', 'suid') && !$this->permissionlib->isBerechtigt('assistenz', 'suid'))
-		{
-			$result =  $this->p->t('lehre','error_keineSchreibrechte');
-
-			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
-		$this->terminateWithSuccess("berechtigt in überschreibender Funktion");
-	}
-
-
-}
+}

application/controllers/api/frontend/v1/notiz/NotizMitarbeiter.php

@@ -1,44 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-use \DateTime as DateTime;
-
-class NotizMitarbeiter extends Notiz_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'isBerechtigt' => ['admin:r', 'assistenz:r'],
-		]);
-
-		//Load Models
-		$this->load->model('person/Notiz_model', 'NotizModel');
-		$this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
-
-		// Load Libraries
-		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
-
-		// Load language phrases
-		$this->loadPhrases([
-			'ui'
-		]);
-	}
-
-	public function isBerechtigt($id, $typeId)
-	{
-		if($typeId != "mitarbeiter_uid")
-		{
-			$this->terminateWithError($this->p->t('ui','error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
-		}
-
-		//TODO define permission
-		if(!$this->permissionlib->isBerechtigt('admin', 'suid') && !$this->permissionlib->isBerechtigt('assistenz', 'suid'))
-		{
-			$result =  $this->p->t('lehre','error_keineSchreibrechte');
-
-			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
-		$this->terminateWithSuccess("berechtigt in überschreibender Funktion");
-	}
-}

application/controllers/api/frontend/v1/notiz/NotizPerson.php

@@ -20,100 +20,33 @@ class NotizPerson extends Notiz_Controller
 			'isBerechtigt' => ['admin:r', 'assistenz:r'],
 			'getCountNotes' => ['admin:r', 'assistenz:r'],
 		]);
-
-		//Load Models
-		$this->load->model('person/Benutzer_model', 'BenutzerModel');
-		$this->load->model('crm/Student_model', 'StudentModel');
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-
-		//Permission checks for allowed Oes
-		if ($this->router->method == 'addNewNotiz')
-		{
-			$json = $this->input->post('data');
-			$post_data = json_decode($json, true);
-			$person_id = $post_data['id'];
-
-			$allowedStgs = $this->permissionlib->getSTG_isEntitledFor('assistenz') ?: [];
-
-			if(!$person_id)
-			{
-				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Person ID']), self::ERROR_TYPE_GENERAL);
-			}
-			$this->_checkIfBerechtigungForOnePrestudentExists($person_id, $allowedStgs);
-		}
-
-		if ( $this->router->method == 'updateNotiz')
-		{
-			$json = $this->input->post('data');
-			$post_data = json_decode($json, true);
-			$notiz_id = $post_data['notiz_id'];
-
-			if(!$notiz_id)
-			{
-				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Notiz ID']), self::ERROR_TYPE_GENERAL);
-			}
-
-			//get person_id
-			$result = $this->NotizzuordnungModel->loadWhere(['notiz_id' => $notiz_id]);
-
-			$data = $this->getDataOrTerminateWithError($result);
-			$person_id = current($data)->person_id;
-
-			$allowedStgs = $this->permissionlib->getSTG_isEntitledFor('assistenz') ?: [];
-			$this->_checkIfBerechtigungForOnePrestudentExists($person_id, $allowedStgs);
-		}
-
-		if ($this->router->method == 'deleteNotiz' )
-		{
-			$notiz_id = $this->input->post('notiz_id');
-			$person_id = $this->input->post('id');
-
-			if(!$notiz_id)
-			{
-				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Notiz ID']), self::ERROR_TYPE_GENERAL);
-			}
-
-			if(!$person_id)
-			{
-				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'person ID']), self::ERROR_TYPE_GENERAL);
-			}
-
-			$allowedStgs = $this->permissionlib->getSTG_isEntitledFor('assistenz') ?: [];
-			$this->_checkIfBerechtigungForOnePrestudentExists($person_id, $allowedStgs);
-		}
 	}
 
 	public function isBerechtigt($id, $typeId)
 	{
 		if($typeId != "person_id")
 		{
-			$this->terminateWithError($this->p->t('ui', 'error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
+			return $this->terminateWithError($this->p->t('ui', 'error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
 		}
 
+		//TODO define permission
 		if (!$this->permissionlib->isBerechtigt('admin', 'suid') && !$this->permissionlib->isBerechtigt('assistenz', 'suid'))
 		{
 			$result =  $this->p->t('lehre', 'error_keineSchreibrechte');
-			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
 		}
 
-		$this->terminateWithSuccess("berechtigt in überschreibender Funktion");
+		return $this->outputJsonSuccess(true);
 	}
 
-	//stv: if person has permission of one studiengang of person -> permission to add/update/delete Note
-	private function _checkIfBerechtigungForOnePrestudentExists($person_id, $allowedStgs)
+	public function loadDokumente()
 	{
-		$result = $this->PrestudentModel->loadWhere(['person_id' => $person_id]);
-		$data = $this->getDataOrTerminateWithError($result);
+		$notiz_id = $this->input->post('notiz_id');
 
-		$checkarray = [];
-		foreach ($data as $item)
-		{
-			if(in_array($item->studiengang_kz, $allowedStgs))
-			{
-				return true;
-			}
-		}
-
-		$this->terminateWithError($this->p->t('ui', 'error_keineBerechtigungStg'), self::ERROR_TYPE_GENERAL);
+		// TODO(chris): make CI variant of endpoint
+		$this->NotizModel->addSelect($this->NotizModel->escape(base_url('content/notizdokdownload.php?id=')) . ' || campus.tbl_dms_version.dms_id AS preview');
+		
+		return parent::loadDokumente();
 	}
-}
+}

application/controllers/api/frontend/v1/notiz/NotizPrestudent.php

@@ -1,117 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-use \DateTime as DateTime;
-
-class NotizPrestudent extends Notiz_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'isBerechtigt' => ['admin:r', 'assistenz:r'],
-		]);
-
-		//Load Models
-		$this->load->model('person/Notiz_model', 'NotizModel');
-		$this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
-		$this->load->model('crm/Student_model', 'StudentModel');
-
-		// Load Libraries
-		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
-
-		// Load language phrases
-		$this->loadPhrases([
-			'ui'
-		]);
-
-		//Permission checks for Studiengangsarray
-		$allowedStgs = $this->permissionlib->getSTG_isEntitledFor('assistenz') ?: [];
-
-		if ($this->router->method == 'addNewNotiz')
-		{
-			$json = $this->input->post('data');
-			$post_data = json_decode($json, true);
-			$prestudent_id = $post_data['id'];
-
-			if(!$prestudent_id)
-			{
-				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Lehreinheit ID']), self::ERROR_TYPE_GENERAL);
-			}
-			$this->_checkAllowedOesFromPrestudent($prestudent_id, $allowedStgs);
-		}
-
-		if ($this->router->method == 'updateNotiz')
-		{
-			$json = $this->input->post('data');
-			$post_data = json_decode($json, true);
-			$notiz_id = $post_data['notiz_id'];
-
-			if(!$notiz_id)
-			{
-				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Notiz ID']), self::ERROR_TYPE_GENERAL);
-			}
-
-			//get prestudent_id
-			$result = $this->NotizzuordnungModel->loadWhere(['notiz_id' => $notiz_id]);
-
-			$data = $this->getDataOrTerminateWithError($result);
-			$prestudent_id = current($data)->prestudent_id;
-
-			if(!$prestudent_id)
-			{
-				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Prestudent ID']), self::ERROR_TYPE_GENERAL);
-			}
-			$this->_checkAllowedOesFromPrestudent($prestudent_id, $allowedStgs);
-		}
-
-		if ($this->router->method == 'deleteNotiz')
-		{
-			$notiz_id = $this->input->post('notiz_id');
-			$prestudent_id = $this->input->post('id');
-
-			if(!$notiz_id)
-			{
-				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Notiz ID']), self::ERROR_TYPE_GENERAL);
-			}
-
-			if(!$prestudent_id)
-			{
-				return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Prestudent ID']), self::ERROR_TYPE_GENERAL);
-			}
-			$this->_checkAllowedOesFromPrestudent($prestudent_id, $allowedStgs);
-		}
-	}
-
-	public function isBerechtigt($id, $typeId)
-	{
-		if($typeId != "prestudent_id")
-		{
-			$this->terminateWithError($this->p->t('ui','error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
-		}
-
-		if(!$this->permissionlib->isBerechtigt('admin', 'suid') && !$this->permissionlib->isBerechtigt('assistenz', 'suid'))
-		{
-			$result =  $this->p->t('lehre','error_keineSchreibrechte');
-
-			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
-		$this->terminateWithSuccess("berechtigt in überschreibender Funktion");
-	}
-
-	private function _checkAllowedOesFromPrestudent($prestudent_id, $allowedStgs)
-	{
-		$student_uid = $this->StudentModel->getUID($prestudent_id);
-
-		$result = $this->StudentModel->loadWhere(['student_uid' => $student_uid]);
-
-		$data = $this->getDataOrTerminateWithError($result);
-		$studiengang_kz = current($data)->studiengang_kz;
-
-		if (!in_array($studiengang_kz, $allowedStgs))
-		{
-			return $this->terminateWithError($this->p->t('ui', 'error_keineBerechtigungStg'), self::ERROR_TYPE_GENERAL);
-		}
-	}
-
-}

application/controllers/api/frontend/v1/notiz/NotizProjekt.php

@@ -1,32 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-use \DateTime as DateTime;
-
-class NotizProjekt extends Notiz_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'isBerechtigt' => ['admin:r', 'assistenz:r'],
-		]);
-	}
-
-	public function isBerechtigt($id, $typeId)
-	{
-		if($typeId != "projekt_kurzbz")
-		{
-			$this->terminateWithError($this->p->t('ui','error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
-		}
-
-		//TODO define permission
-		if(!$this->permissionlib->isBerechtigt('admin', 'suid') && !$this->permissionlib->isBerechtigt('assistenz', 'suid'))
-		{
-			$result =  $this->p->t('lehre','error_keineSchreibrechte');
-
-			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
-		$this->terminateWithSuccess("berechtigt in überschreibender Funktion");
-	}
-}

application/controllers/api/frontend/v1/notiz/NotizProjektphase.php

@@ -1,32 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-use \DateTime as DateTime;
-
-class NotizProjektphase extends Notiz_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'isBerechtigt' => ['admin:r', 'assistenz:r'],
-		]);
-	}
-
-	public function isBerechtigt($id, $typeId)
-	{
-		if($typeId != "projektphase_id")
-		{
-			$this->terminateWithError($this->p->t('ui','error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
-		}
-
-		//TODO define permission
-		if(!$this->permissionlib->isBerechtigt('admin', 'suid') && !$this->permissionlib->isBerechtigt('assistenz', 'suid'))
-		{
-			$result =  $this->p->t('lehre','error_keineSchreibrechte');
-
-			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
-		$this->terminateWithSuccess("berechtigt in überschreibender Funktion");
-	}
-}

application/controllers/api/frontend/v1/notiz/NotizProjekttask.php

@@ -1,32 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-use \DateTime as DateTime;
-
-class NotizProjekttask extends Notiz_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'isBerechtigt' => ['admin:r', 'assistenz:r'],
-		]);
-	}
-
-	public function isBerechtigt($id, $typeId)
-	{
-		if($typeId != "projekttask_id")
-		{
-			$this->terminateWithError($this->p->t('ui','error_typeNotizIdIncorrect'), self::ERROR_TYPE_GENERAL);
-		}
-
-		//TODO define permission
-		if(!$this->permissionlib->isBerechtigt('admin', 'suid') && !$this->permissionlib->isBerechtigt('assistenz', 'suid'))
-		{
-			$result =  $this->p->t('lehre','error_keineSchreibrechte');
-
-			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-		}
-		$this->terminateWithSuccess("berechtigt in überschreibender Funktion");
-	}
-}

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

@@ -36,44 +36,15 @@ class Aufnahmetermine extends FHCAPI_Controller
 		// Load models
 		$this->load->model('crm/Reihungstest_model', 'ReihungstestModel');
 		$this->load->model('crm/RtPerson_model', 'RtPersonModel');
-		$this->load->model('organisation/Studienplan_model', 'StudienplanModel');
-		$this->load->model('organisation/Studienordnung_model', 'StudienordnungModel');
-		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
 	}
 
 	public function getAufnahmetermine($person_id)
 	{
 		$result = $this->ReihungstestModel->getReihungstestPerson($person_id);
-		$arrayRt = $this->getDataOrTerminateWithError($result);
 
-		foreach ($arrayRt as $item) {
-			//Studienplan
-			$result = $this->StudienplanModel->loadWhere([
-				'studienplan_id' => $item->studienplan_id
-			]);
-			$data = $this->getDataOrTerminateWithError($result);
-			$studienordnung_id_ber = current($data)->studienordnung_id;
+		$data = $this->getDataOrTerminateWithError($result);
 
-			//Studienordnung
-			$result = $this->StudienordnungModel->loadWhere([
-				'studienordnung_id' => $studienordnung_id_ber
-			]);
-			$data = $this->getDataOrTerminateWithError($result);
-			$studiengang_kz_ber = current($data)->studiengang_kz;
-
-			//Studiengang von studiengang_kz_ber
-			$result = $this->StudiengangModel->load($studiengang_kz_ber);
-			$data = $this->getDataOrTerminateWithError($result);
-
-			$studiengangkurzbzlang_ber = current($data)->kurzbzlang;
-			$typ_ber = current($data)->typ;
-
-			//add to Array
-			$item->studiengang_kz_ber = $studiengang_kz_ber;
-			$item->studiengangkurzbzlang_ber = $studiengangkurzbzlang_ber;
-			$item->studiengangtyp_ber = $typ_ber;
-		}
-		$this->terminateWithSuccess($arrayRt);
+		$this->terminateWithSuccess($data);
 	}
 
 	public function insertAufnahmetermin()
@@ -89,6 +60,7 @@ class Aufnahmetermine extends FHCAPI_Controller
 			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Person ID']), self::ERROR_TYPE_GENERAL);
 		}
 
+
 		$rt_id = (isset($formData['rt_id']) && !empty($formData['rt_id'])) ? $formData['rt_id'] : null;
 		$anmeldedatum =	(isset($formData['anmeldedatum']) && !empty($formData['anmeldedatum'])) ? $formData['anmeldedatum'] : null;
 		$teilgenommen =	(isset($formData['teilgenommen']) && !empty($formData['teilgenommen'])) ? $formData['teilgenommen'] : false;
@@ -252,11 +224,7 @@ class Aufnahmetermine extends FHCAPI_Controller
 			)
 		);
 
-		//check if existing placementtest
-		if(!hasData($result))
-			$this->terminateWithSuccess([]);
-		else
-			$data = getData($result);
+		$data = $this->getDataOrTerminateWithError($result);
 
 		$studienplan_arr = [];
 		$include_ids = [];
@@ -265,18 +233,12 @@ class Aufnahmetermine extends FHCAPI_Controller
 			if($item->studienplan_id != null)
 				$studienplan_arr[] = $item->studienplan_id;
 		}
-		if(!hasData($studienplan_arr))
-			$this->terminateWithSuccess([]);
 
 		//get Placementtests Person
 		$person_id = $this->_getPersonId($prestudent_id);
 		$resultRt = $this->ReihungstestModel->getReihungstestPerson($person_id);
 
-		//check if existing placementtest
-		if(!hasData($result))
-			$this->terminateWithSuccess([]);
-		else
-			$dataRt = getData($resultRt);
+		$dataRt = $this->getDataOrTerminateWithError($resultRt);
 
 		foreach ($dataRt as $item)
 		{
@@ -392,7 +354,6 @@ class Aufnahmetermine extends FHCAPI_Controller
 		$person_id = $this->input->get('person_id');
 		$punkte = $this->input->get('punkte');
 		$reihungstest_id = $this->input->get('reihungstest_id');
-		$has_excluded_gebiete = $this->input->get('hasExcludedAreas');
 
 		if(!$reihungstest_id)
 		{
@@ -403,27 +364,22 @@ class Aufnahmetermine extends FHCAPI_Controller
 		$studiengang_kz = $this->input->get('studiengang_kz');
 
 		$this->load->model('testtool/Ablauf_model', 'AblaufModel');
-		$result = $this->AblaufModel->getAblaufGebieteAndGewichte($studiengang_kz, 1);
+		$result = $this->AblaufModel->getAblaufGebieteAndGewichte($studiengang_kz);
 		$data = $this->getDataOrTerminateWithError($result);
 
 		$weightedArray = [];
-		$basis_gebiet_id_arr = [];
-		$basis_gebiet_id_toString = '';
 		foreach ($data as $abl)
 		{
 			$weightedArray[$abl->gebiet_id] = $abl->gewicht;
-			$basis_gebiet_id_arr[]= $abl->gebiet_id;
 		}
-		$basis_gebiet_id_toString = implode(', ', $basis_gebiet_id_arr);
 
-		$result = $this->ReihungstestModel->getReihungstestErgebnisPerson(
-			$person_id,
-			$punkte,
-			$reihungstest_id,
-			$weightedArray,
-			$has_excluded_gebiete,
-			$basis_gebiet_id_toString
-		);
+		$result = $this->ReihungstestModel->getReihungstestErgebnisPerson($person_id, $punkte, $reihungstest_id, $weightedArray);
+
+/*		if (isError($result))
+		{
+			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}*/
+
 		$this->terminateWithSuccess($result);
 	}
 

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

@@ -200,8 +200,7 @@ class Config extends FHCAPI_Controller
 					'type' => 'select',
 					'values' => $buchungstyp_kurzbz_plus_all,
 					'value_key' => 'buchungstyp_kurzbz',
-					'label_key' => 'beschreibung',
-					'default' => 'all'
+					'label_key' => 'beschreibung'
 				],
 				'samestg' => [
 					'type' => 'bool',
@@ -227,8 +226,7 @@ class Config extends FHCAPI_Controller
 					'type' => 'select',
 					'values' => $buchungstyp_kurzbz_plus_all,
 					'value_key' => 'buchungstyp_kurzbz',
-					'label_key' => 'beschreibung',
-					'default' => 'all'
+					'label_key' => 'beschreibung'
 				],
 				'samestg' => [
 					'type' => 'bool',

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

@@ -753,10 +753,6 @@ class Dokumente extends FHCAPI_Controller
 		);
 
 		$data = $this->getDataOrTerminateWithError($result);
-		if(!(is_array($data) && count($data) > 0))
-		{
-			return null;
-		}
 		$student = current($data);
 
 		return $student->student_uid;

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

@@ -108,10 +108,6 @@ class Student extends FHCAPI_Controller
 		$this->PrestudentModel->addSelect('p.matr_nr');
 		$this->PrestudentModel->addSelect('p.anrede');
 		$this->PrestudentModel->addSelect('p.zugangscode');
-		if($this->permissionlib->isBerechtigt('student/bpk'))
-		{
-			$this->PrestudentModel->addSelect('p.bpk');
-		}
 
 		if (defined('ACTIVE_ADDONS') && strpos(ACTIVE_ADDONS, 'bewerbung') !== false) {
 			$this->PrestudentModel->addSelect(

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

@@ -468,6 +468,8 @@ class Students extends FHCAPI_Controller
 		$this->PrestudentModel->addSelect("'' AS verband");
 		$this->PrestudentModel->addSelect("'' AS gruppe");
 		$this->addSelectPrioRel();
+		$query_studiensemester_kurzbz = $studiensemester_kurzbz ? $this->PrestudentModel->escape($studiensemester_kurzbz) : '\'NULL\'';
+		$this->PrestudentModel->addSelect($query_studiensemester_kurzbz . ' as query_studiensemester_kurzbz');
 
 		$this->addFilter($studiensemester_kurzbz);
 
@@ -588,6 +590,7 @@ class Students extends FHCAPI_Controller
 		$this->PrestudentModel->addSelect('v.verband');
 		$this->PrestudentModel->addSelect('v.gruppe');
 		$this->PrestudentModel->addSelect("'' AS priorisierung_relativ");
+		$this->PrestudentModel->addSelect($this->PrestudentModel->escape($studiensemester_kurzbz) . ' as query_studiensemester_kurzbz');
 
 
 		$where = [];
@@ -611,7 +614,7 @@ class Students extends FHCAPI_Controller
 			if (!$verband && !$gruppe && $orgform_kurzbz !== null) {
 				$this->PrestudentModel->db->where(
 					"(
-						SELECT orgform_kurzbz
+						SELECT orgform_kurzbz 
 						FROM public.tbl_prestudentstatus 
 						WHERE prestudent_id=tbl_prestudent.prestudent_id 
 						AND studiensemester_kurzbz=" . $this->PrestudentModel->escape($studiensemester_kurzbz) . " 
@@ -798,6 +801,7 @@ class Students extends FHCAPI_Controller
 		$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');
+		$this->PrestudentModel->addSelect($this->PrestudentModel->escape($studiensemester_kurzbz) . ' as query_studiensemester_kurzbz');
 
 		//add status per semester
 		$this->PrestudentModel->addSelect(
@@ -850,41 +854,6 @@ class Students extends FHCAPI_Controller
 	{
 		$stdsemEsc = $studiensemester_kurzbz ? $this->PrestudentModel->escape($studiensemester_kurzbz) : 'NULL';
 
-		$this->load->config('stv');
-		$tags = $this->config->item('stv_prestudent_tags');
-
-		$whereTags = '';
-		if (is_array($tags) && !isEmptyArray($tags)) {
-			$tags = array_keys($tags);
-
-			foreach ($tags as $key => $tag) {
-				$tags[$key] = $this->db->escape($tag);
-			}
-			$whereTags = " AND nt.typ_kurzbz IN (" . implode(",", $tags) . ")";
-		}
-		$subQueryTag = "
-		  (
-			SELECT
-			  tag.prestudent_id,
-			  COALESCE(json_agg(tag ORDER BY tag.done), '[]'::json) AS tags
-			FROM (
-			  SELECT DISTINCT ON (n.notiz_id)
-				n.notiz_id AS id,
-				nt.typ_kurzbz,
-				array_to_json(nt.bezeichnung_mehrsprachig)->>0 AS beschreibung,
-				n.text AS notiz,
-				nt.style,
-				n.erledigt AS done,
-				nz.prestudent_id
-			  FROM public.tbl_notizzuordnung AS nz
-				JOIN public.tbl_notiz AS n ON nz.notiz_id = n.notiz_id
-				JOIN public.tbl_notiz_typ AS nt ON n.typ = nt.typ_kurzbz "
-			. $whereTags .
-			"
-			) AS tag
-			GROUP BY tag.prestudent_id
-		  ) AS tag_data_agg
-		";
 
 		$this->PrestudentModel->addJoin('public.tbl_studiengang stg', 'studiengang_kz', 'LEFT');
 		$this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
@@ -907,11 +876,8 @@ class Students extends FHCAPI_Controller
 			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->PrestudentModel->addJoin($subQueryTag, 'tag_data_agg.prestudent_id = tbl_prestudent.prestudent_id', 'LEFT');
-
 
 		$this->PrestudentModel->addSelect("b.uid");
-		$this->PrestudentModel->addSelect('tag_data_agg.tags');
 		$this->PrestudentModel->addSelect('titelpre');
 		$this->PrestudentModel->addSelect('nachname');
 		$this->PrestudentModel->addSelect('vorname');
@@ -969,7 +935,6 @@ class Students extends FHCAPI_Controller
 
 		$this->PrestudentModel->addSelect('mentor');
 		$this->PrestudentModel->addSelect('b.aktiv AS bnaktiv');
-		$this->PrestudentModel->addSelect('unruly');
 
 		$this->PrestudentModel->db->where_in('tbl_prestudent.studiengang_kz', $this->allowedStgs);
 

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

@@ -1,48 +0,0 @@
-<?php
-
-if (!defined('BASEPATH'))
-	exit('No direct script access allowed');
-
-class Tags extends Tag_Controller
-{
-	const BERECHTIGUNG_KURZBZ = ['admin:rw', 'assistenz:rw'];
-
-	public function __construct()
-	{
-		parent::__construct([
-			'getTag' => self::BERECHTIGUNG_KURZBZ,
-			'getTags' => self::BERECHTIGUNG_KURZBZ,
-			'addTag' => self::BERECHTIGUNG_KURZBZ,
-			'updateTag' => self::BERECHTIGUNG_KURZBZ,
-			'doneTag' => self::BERECHTIGUNG_KURZBZ,
-			'deleteTag' => self::BERECHTIGUNG_KURZBZ
-		]);
-
-	$this->config->load('stv');
-	}
-
-	public function getTag($readonly_tags = null)
-	{
-		parent::getTag($this->config->item('stv_prestudent_tags'));
-	}
-	public function getTags($tags = null)
-	{
-		parent::getTags($this->config->item('stv_prestudent_tags'));
-	}
-	public function addTag($withZuordnung = true, $updatable_tags = null)
-	{
-		parent::addTag(true, $this->config->item('stv_prestudent_tags'));
-	}
-	public function updateTag($updatable_tags = null)
-	{
-		parent::updateTag($this->config->item('stv_prestudent_tags'));
-	}
-	public function deleteTag($withZuordnung = true, $updatable_tags = null)
-	{
-		parent::deleteTag(true, $this->config->item('stv_prestudent_tags'));
-	}
-	public function doneTag($updatable_tags = null)
-	{
-		parent::doneTag($this->config->item('stv_prestudent_tags'));
-	}
-}

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

@@ -1,62 +0,0 @@
-<?php
-/**
- * Copyright (C) 2024 fhcomplete.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-if (!defined('BASEPATH')) exit('No direct script access allowed');
-
-use CI3_Events as Events;
-
-/**
- * This controller operates between (interface) the JS (GUI) and the back-end
- * Provides data to the ajax get calls about the VV Config
- * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
- */
-class Config extends FHCAPI_Controller
-{
-	public function __construct()
-	{
-		parent::__construct([
-			'printDocument' => ['vertrag/mitarbeiter:r'],
-		]);
-	}
-
-	public function printDocument()
-	{
-		$params = [];
-		$menu = [];
-
-		Events::trigger(
-			'multiActionPrintHonorarvertrag',
-			// passing $menu per reference
-			function & () use (&$menu) {
-				return $menu;
-			},
-			$params
-		);
-
-		if (is_array($menu) && isset($menu[0]))
-		{
-			$this->terminateWithSuccess($menu[0]);
-		}
-		else
-		{
-		//	$this->terminateWithError('Error with Event 'multiActionPrintHonorarvertrag');
-			$this->terminateWithSuccess();
-
-		}
-	}
-}

application/controllers/api/frontend/v1/vertraege/Vertraege.php

@@ -26,6 +26,9 @@ class Vertraege extends FHCAPI_Controller
 			'deleteLehrauftrag' =>['vertrag/mitarbeiter:w'],
 			'deleteBetreuung' =>['vertrag/mitarbeiter:w'],
 			'getMitarbeiter' => ['vertrag/mitarbeiter:r'],
+			'getHeader' => ['vertrag/mitarbeiter:r'],
+			'getPersonAbteilung' => ['vertrag/mitarbeiter:r'],
+			'getLeitungOrg' => ['vertrag/mitarbeiter:r'],
 		]);
 
 		//Load Models and Libraries
@@ -238,7 +241,7 @@ class Vertraege extends FHCAPI_Controller
 			}
 		}
 		$this->db->trans_complete();
-		$this->terminateWithSuccess($vertrag_id);
+		$this->terminateWithSuccess(true);
 	}
 
 	public function updateContract()
@@ -355,7 +358,7 @@ class Vertraege extends FHCAPI_Controller
 		}
 		$this->db->trans_complete();
 
-		$this->terminateWithSuccess($vertrag_id);
+		$this->terminateWithSuccess(true);
 	}
 
 	public function loadContract($vertrag_id)
@@ -681,4 +684,37 @@ class Vertraege extends FHCAPI_Controller
 		}
 		return $this->terminateWithSuccess(getData($result));
 	}
+
+	public function getPersonAbteilung($mitarbeiter_uid)
+	{
+		$this->load->model('ressource/Mitarbeiter_model', 'Mitarbeitermodel');
+
+		$result = $this->Mitarbeitermodel->getPersonAbteilung($mitarbeiter_uid);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess(current($data));
+	}
+
+	public function getLeitungOrg($oekurzbz)
+	{
+		$this->load->model('ressource/Mitarbeiter_model', 'Mitarbeitermodel');
+
+		$result = $this->Mitarbeitermodel->getLeitungOrg($oekurzbz);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess(current($data));
+	}
+
+	public function getHeader($person_id)
+	{
+		$this->load->model('ressource/Mitarbeiter_model', 'Mitarbeitermodel');
+
+		$result = $this->Mitarbeitermodel->getHeader($person_id);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess(current($data));
+	}
 }

application/controllers/jobs/AbgabetoolJob.php

@@ -495,10 +495,6 @@ class AbgabetoolJob extends JOB_Controller
 		// get all new or changed termine in interval
 		$result = $this->_ci->PaabgabeModel->findAbgabenNewOrUpdatedSince($interval, $relevantTypes);
 		$retval = getData($result);
-		if(!$retval) {
-			$this->_ci->logInfo("Keine Emails an Betreuer über neue oder veränderte Termine versandt");
-			return;
-		}
 		
 		// group changed/new abgaben for projektarbeiten
 		$projektarbeiten = [];
@@ -561,8 +557,6 @@ class AbgabetoolJob extends JOB_Controller
 			$anredeFillString = $data->anrede == "Herr" ? "r" : "";
 			$fullFormattedNameString = $data->first;
 
-			$relevantCounter = 0; // workaround to check if a betreuer needs to have any notification about relevant
-			// abgaben at all to avoid sending empty emails since we filter on certain conditions
 			forEach($tupelArr as $tupel) {
 				$projektarbeit_id = $tupel[0];
 				$betreuerRow = $tupel[1];
@@ -581,8 +575,6 @@ class AbgabetoolJob extends JOB_Controller
 					continue;
 				}
 
-				$relevantCounter++;
-
 				// format the Student Name
 				$s = $relevantAbgaben[0];
 				$nameParts = [];
@@ -641,11 +633,6 @@ class AbgabetoolJob extends JOB_Controller
 			// done with building the change list, now send it
 			$betreuerRow = $tupelArr[0][1];
 			
-			if($relevantCounter == 0) {
-				$this->_ci->logInfo('No Relevant Abgaben to notify Betreuer PersonID: "'.$betreuerRow->person_id.'".');
-				continue;
-			}
-			
 			$path = $this->_ci->config->item('URL_MITARBEITER');
 			$url = CIS_ROOT.$path;
 

application/core/CI3_Events.php

@@ -35,7 +35,7 @@ class CI3_Events
 			});
 			self::$eventsSorted[$event] = true;
 		}
-
+		
 		foreach (self::$events[$event] as $conf) {
 			$conf[1](...$args);
 		}

application/core/Notiz_Controller.php

@@ -8,7 +8,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 {
 	const DEFAULT_PERMISSION_R  = 'admin:r';
 	const DEFAULT_PERMISSION_RW = 'admin:rw';
-
+	//public function __construct($zuordnung = 'person/Notizzuordnung_model')
 	public function __construct($permissions)
 	{
 		$default_permissions = [
@@ -97,13 +97,13 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 		if (isError($result)) {
 			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 		}
-		$this->terminateWithSuccess(getData($result) ?: []);
+		return $this->terminateWithSuccess(getData($result) ?: []);
 	}
 
 
 	//Override function
 	protected function isBerechtigt($id, $typeId){
-		$this->terminateWithError("in abstract function: define right in extension", self::ERROR_TYPE_GENERAL);
+		return $this->terminateWithError("in abstract function: define right in extension", self::ERROR_TYPE_GENERAL);
 	}
 
 	public function loadNotiz()
@@ -112,6 +112,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 
 		$notiz_id = $this->input->post('notiz_id');
 
+		//$this->load->model('person/Notiz_model', 'NotizModel');
 		$this->NotizModel->addJoin('public.tbl_notiz_dokument', 'notiz_id', 'LEFT');
 		$this->NotizModel->addSelect('*');
 		$this->NotizModel->addSelect("TO_CHAR(CASE WHEN public.tbl_notiz.updateamum >= public.tbl_notiz.insertamum 
@@ -142,9 +143,14 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 
 		$uid = getAuthUID();
 
-		$json = $this->input->post('data');
-		$post_data = json_decode($json, true);
-		$this->form_validation->set_data($post_data);
+		if (isset($_POST['data']))
+		{
+			$data = json_decode($_POST['data']);
+			unset($_POST['data']);
+			foreach ($data as $k => $v) {
+				$_POST[$k] = $v;
+			}
+		}
 
 		//Form Validation
 		$this->form_validation->set_rules('titel', 'Titel', 'required', [
@@ -160,25 +166,26 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 		}
 
-		$titel =  $post_data['titel'];
-		$text = $post_data['text'];
-		$erledigt = $post_data['erledigt'];
-		$bearbeiter_uid = isset($post_data['bearbeiter']) ? $post_data['bearbeiter'] : null;
-		$type = $post_data['typeId'];
-		$start = isset($post_data['start']) ? $post_data['start'] : null;
-		$ende = isset($post_data['ende']) ? $post_data['ende'] : null;
+		$titel = $this->input->post('titel');
+		$text = $this->input->post('text');
+		$erledigt = $this->input->post('erledigt');
+		$verfasser_uid = isset($_POST['verfasser']) ? $_POST['verfasser'] : $uid;
+		$bearbeiter_uid = isset($_POST['bearbeiter']) ? $_POST['bearbeiter'] : null;
+		$type = $this->input->post('typeId');
+		$start = $this->input->post('start');
+		$ende = $this->input->post('ende');
 
 		// Start DB transaction
 		$this->db->trans_start();
 
 		//Save note
-		$result = $this->NotizModel->insert(array('titel' => $titel, 'text' => $text, 'erledigt' => $erledigt, 'verfasser_uid' => $uid,
-			"insertvon" => $uid, 'start' => $start, 'ende' => $ende, 'bearbeiter_uid' => $bearbeiter_uid));
+		$result = $this->NotizModel->insert(array('titel' => $titel, 'text' => $text, 'erledigt' => $erledigt, 'verfasser_uid' => $verfasser_uid,
+			"insertvon" => $verfasser_uid, 'start' => $start, 'ende' => $ende, 'bearbeiter_uid' => $bearbeiter_uid));
 
 		if (isError($result))
 		{
 			$this->db->trans_rollback();
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 		}
 
 		$notiz_id = $result->retval;
@@ -213,7 +220,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 			if (isError($result))
 			{
 				$this->db->trans_rollback();
-				$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+				return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 			}
 			$dms_id_arr[] = $result->retval['dms_id'];
 		}
@@ -228,28 +235,34 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 				if (isError($result))
 				{
 					$this->db->trans_rollback();
-					$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+					return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 				}
 			}
 		}
 		$this->db->trans_commit();
-		$this->terminateWithSuccess($result);
+		return $this->terminateWithSuccess($result);
 	}
 
 	public function updateNotiz()
 	{
-
 		$this->load->library('form_validation');
 		$this->load->library('DmsLib');
 
-		$json = $this->input->post('data');
-		$post_data = json_decode($json, true);
+		if (isset($_POST['data']))
+		{
+			$data = json_decode($_POST['data']);
+			unset($_POST['data']);
+			foreach ($data as $k => $v) {
+				$_POST[$k] = $v;
+			}
+		}
 
-		$this->form_validation->set_data($post_data);
+		$notiz_id = $this->input->post('notiz_id');
 
-		$this->form_validation->set_rules('notiz_id', 'Notiz ID', 'required', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'notiz_id'])
-		]);
+		if(!$notiz_id)
+		{
+			$this->terminateWithError($this->p->t('ui','error_missingId',['id'=>'Notiz_id']), self::ERROR_TYPE_GENERAL);
+		}
 
 		//Form Validation
 		$this->form_validation->set_rules('titel', 'Titel', 'required', [
@@ -267,23 +280,25 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 
 		//update Notiz
 		$uid = getAuthUID();
-		$titel = $post_data['titel'];
-		$text = $post_data['text'];
-		$bearbeiter_uid = isset($post_data['bearbeiter']) ? $post_data['bearbeiter'] : $post_data['bearbeiter_uid'];
-		$erledigt = $post_data['erledigt'];
-		$start = $post_data['start'];
-		$ende = $post_data['ende'];
+		$titel = $this->input->post('titel');
+		$text = $this->input->post('text');
+		$verfasser_uid = isset($_POST['verfasser']) ? $_POST['verfasser'] : $uid;
+		$bearbeiter_uid = isset($_POST['bearbeiter']) ? $_POST['bearbeiter'] : $uid;
+		$erledigt = $this->input->post('erledigt');
+		$start = $this->input->post('start');
+		$ende = $this->input->post('ende');
 
 		$result = $this->NotizModel->update(
 			[
-				'notiz_id' => $post_data['notiz_id'],
+				'notiz_id' => $notiz_id
 			],
 			[
 				'titel' =>  $titel,
 				'updatevon' => $uid,
 				'updateamum' => date('c'),
 				'text' => $text,
-				'bearbeiter_uid' => isEmptyString($bearbeiter_uid) ? null : $bearbeiter_uid,
+				'verfasser_uid' => $verfasser_uid,
+				'bearbeiter_uid' => $bearbeiter_uid,
 				'start' => $start,
 				'ende' => $ende,
 				'erledigt' => $erledigt
@@ -291,7 +306,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 		);
 		if (isError($result))
 		{
-			$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
+			return $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
 		}
 
 		//update(1) loading all dms-entries with this notiz_id
@@ -299,7 +314,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 		$this->load->model('person/Notizdokument_model', 'NotizdokumentModel');
 		$this->NotizdokumentModel->addJoin('campus.tbl_dms_version', 'dms_id');
 
-		$result = $this->NotizdokumentModel->loadWhere(array('notiz_id' => $post_data['notiz_id']));
+		$result = $this->NotizdokumentModel->loadWhere(array('notiz_id' => $notiz_id));
 		$result = $this->getDataOrTerminateWithError($result);
 		foreach ($result as $doc) {
 			$dms_id_arr[$doc->dms_id] = array(
@@ -336,7 +351,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 				$result = $this->getDataOrTerminateWithError($result);
 				$dms_id = $result['dms_id'];
 
-				$result = $this->NotizdokumentModel->insert(array('notiz_id' => $post_data['notiz_id'], 'dms_id' => $dms_id));
+				$result = $this->NotizdokumentModel->insert(array('notiz_id' => $notiz_id, 'dms_id' => $dms_id));
 
 				$this->getDataOrTerminateWithError($result);
 			}
@@ -350,7 +365,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 			$this->getDataOrTerminateWithError($result);
 		}
 
-		$this->terminateWithSuccess($result);
+		return $this->terminateWithSuccess($result);
 	}
 
 	public function deleteNotiz()
@@ -401,15 +416,15 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 		if (isError($result))
 		{
 			$this->db->trans_rollback();
-			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
 		}
 		if(!hasData($result))
 		{
-			$this->terminateWithError($this->p->t('ui','error_missingId', ['id'=> 'Notiz_id']), self::ERROR_TYPE_GENERAL);
+			return $this->terminateWithError($this->p->t('ui','error_missingId', ['id'=> 'Notiz_id']), self::ERROR_TYPE_GENERAL);
 		}
 
 		$this->db->trans_complete();
-		$this->terminateWithSuccess(getData($result));
+		return $this->terminateWithSuccess(getData($result));
 	}
 
 	public function loadDokumente()
@@ -425,14 +440,14 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 			array('public.tbl_notiz.notiz_id' => $notiz_id)
 		);
 		if (isError($result)) {
-			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+			return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
 		}
 
 		if(!hasData($result))
 		{
-			$this->terminateWithError($this->p->t('ui','error_missingId', ['id'=> 'Notiz_id']), self::ERROR_TYPE_GENERAL);
+			return $this->terminateWithError($this->p->t('ui','error_missingId', ['id'=> 'Notiz_id']), self::ERROR_TYPE_GENERAL);
 		}
-		$this->terminateWithSuccess(getData($result));
+		return $this->terminateWithSuccess(getData($result));
 	}
 
 	public function getMitarbeiter($searchString)
@@ -442,7 +457,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 		if (isError($result)) {
 			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
 		}
-		$this->terminateWithSuccess($result);
+		return $this->terminateWithSuccess($result);
 	}
 
 	public function getCountNotes($person_id)
@@ -461,4 +476,4 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 		return $this->terminateWithSuccess($anzahl->anzahl ?: 0);
 	}
 
-}
+}

application/helpers/hlp_header_helper.php

@@ -269,199 +269,3 @@ function absoluteJsImportUrl($relurl)
 	}
 	return $url;
 }
-
-/*
- * Manipulate CI views includes Array to load
- *   - public/js/FhcApps.js via customJSs and
- *   - app customisation js and/or css from extensions via customJSModules
- * if customJSModules contains at least one vuejs app and customisation files
- * exist in extensions
- */
-class ExtendableAppsHelper
-{
-	private static $instance = null;
-
-	protected $extensions;
-
-	protected $customCSSs;
-	protected $customJSs;
-	protected $customJSModules;
-
-	protected $initialised;
-	protected $appscount;
-
-	protected $extCustomCSSs;
-	protected $extCustomJSs;
-	protected $extCustomJSModules;
-
-	private function __construct()
-	{
-		$this->extensions = array();
-		$this->customCSSs = null;
-		$this->customJSs = null;
-		$this->customJSModules = null;
-
-		$this->initialised = false;
-		$this->appscount = 0;
-
-		$this->extCustomCSSs = null;
-		$this->extCustomJSs = null;
-		$this->extCustomJSModules = null;
-	}
-
-	public static function getInstance()
-	{
-		if(self::$instance === null)
-		{
-			self::$instance = new ExtendableAppsHelper();
-		}
-		return self::$instance;
-	}
-
-	public function init($customCSSs, $customJSs, $customJSModules)
-	{
-		if($this->initialised)
-		{
-			return;
-		}
-
-		$this->customCSSs = $customCSSs;
-		$this->customJSs = $customJSs;
-		$this->customJSModules = $customJSModules;
-		$this->initialised = true;
-
-		if(!isset($this->customJSModules))
-		{
-			return;
-		}
-
-		if(!is_array($this->customJSModules))
-		{
-			$this->customJSModules = array($this->customJSModules);
-		}
-
-		if(count($this->customJSModules) < 1)
-		{
-			return;
-		}
-
-		$this->buildExtensionsList();
-		$this->prepareExtendedArrays();
-	}
-
-	public function getCustomCSSs()
-	{
-		if(is_null($this->extCustomCSSs))
-		{
-			return $this->customCSSs;
-		}
-		return $this->extCustomCSSs;
-	}
-
-	public function getCustomJSs()
-	{
-		if(is_null($this->extCustomJSs))
-		{
-			return $this->customJSs;
-		}
-		return $this->extCustomJSs;
-	}
-
-	public function getCustomJSModules()
-	{
-		if(is_null($this->extCustomJSModules))
-		{
-			return $this->customJSModules;
-		}
-		return $this->extCustomJSModules;
-	}
-
-	protected function buildExtensionsList()
-	{
-		$this->extensions = array();
-		$fsiterator = new FilesystemIterator(FHCPATH . 'application/extensions');
-		foreach ($fsiterator as $fsitem)
-		{
-			if(preg_match('/^FHC-Core-/', $fsitem->getBasename()))
-			{
-				$this->extensions[] = $fsitem->getBasename();
-			}
-		}
-	}
-
-	protected function prepareExtendedArrays()
-	{
-		$this->appscount = 0;
-		$this->initExtCustomCSSs();
-		$this->extCustomJSModules = array();
-		foreach($this->customJSModules as $item)
-		{
-			$matches = array();
-			if(preg_match('#^public/(extensions/FHC-Core-.+)?js/apps/(.*)\.js$#', $item, $matches))
-			{
-				$this->appscount++;
-
-				$fhcextension = $matches[1];
-				$app = $matches[2];
-
-				$extend_js_suffix = 'js/extend_app/' . $fhcextension . $app . '.js';
-				$extend_css_suffix = 'css/extend_app/' . $fhcextension . $app . '.css';
-
-				foreach($this->extensions as $extension)
-				{
-					$extend_js = 'public/extensions/' . $extension . '/' . $extend_js_suffix;
-					$extend_css = 'public/extensions/' . $extension . '/' . $extend_css_suffix;
-
-					if(is_readable(FHCPATH . $extend_js))
-					{
-						array_push($this->extCustomJSModules, $extend_js);
-					}
-
-					if(is_readable(FHCPATH . $extend_css))
-					{
-						array_push($this->extCustomCSSs, $extend_css);
-					}
-				}
-			}
-			array_push($this->extCustomJSModules, $item);
-		}
-
-		if($this->appscount > 0)
-		{
-			$this->addFhcAppsJs();
-		}
-	}
-
-	protected function initExtCustomCSSs()
-	{
-		if(!isset($this->customCSSs))
-		{
-			$this->extCustomCSSs = array();
-		}
-		elseif(!is_array($this->customCSSs))
-		{
-			$this->extCustomCSSs = array($this->customCSSs);
-		}
-		else
-		{
-			$this->extCustomCSSs = $this->customCSSs;
-		}
-	}
-
-	protected function addFhcAppsJs()
-	{
-		if(!isset($this->customJSs))
-		{
-			$this->extCustomJSs = array();
-		}
-		elseif(!is_array($this->customJSs))
-		{
-			$this->extCustomJSs = array($this->customJSs);
-		}
-		else
-		{
-			$this->extCustomJSs = $this->customJSs;
-		}
-		array_push($this->extCustomJSs, 'public/js/FhcApps.js');
-	}
-}

application/libraries/DocsboxLib.php

@@ -180,8 +180,7 @@ class DocsboxLib
 					}
 					// Just started or still working on it
 					elseif ($getStatusResponse->body->status == self::STATUS_WORKING
-						|| $getStatusResponse->body->status == self::STATUS_STARTED
-						|| $getStatusResponse->body->status == self::STATUS_QUEUED)
+						|| $getStatusResponse->body->status == self::STATUS_STARTED)
 					{
 						// go on!
 					}

application/models/accounting/Vertrag_model.php

@@ -490,175 +490,6 @@ class Vertrag_model extends DB_Model
         return $bezeichnung;
     }
 
-	/**
-	 * Loads all Contracts of a Person
-	 * @param $person_id
-	 * @return array of objects
-	 */
-	public function loadContractsOfPerson($person_id)
-	{
-		$query = "
-			SELECT
-					*,
-					tbl_vertrag.bezeichnung as bezeichnung,
-					tbl_vertragstyp.bezeichnung as vertragstyp_bezeichnung,
-					tbl_vertrag.vertragsdatum,
-					(SELECT bezeichnung FROM lehre.tbl_vertragsstatus 
-					JOIN lehre.tbl_vertrag_vertragsstatus USING(vertragsstatus_kurzbz)
-						WHERE vertrag_id=tbl_vertrag.vertrag_id ORDER BY datum desc limit 1) as status, anmerkung,
-			    CASE
-					WHEN EXISTS (
-						SELECT 1
-						FROM lehre.tbl_vertrag_vertragsstatus
-						WHERE vertrag_id = tbl_vertrag.vertrag_id
-						AND vertragsstatus_kurzbz = 'abgerechnet'
-					) THEN true 
-					ELSE false
-				END AS isAbgerechnet
-				FROM
-					lehre.tbl_vertrag
-					LEFT JOIN lehre.tbl_vertragstyp USING(vertragstyp_kurzbz)
-				WHERE person_id= ?";
-
-
-		return $this->execQuery($query, array($person_id));
-	}
-
-	/**
-	 * Loads all Contracts of a Person that are not assigned yet
-	 * @param $person_id
-	 * @return array of objects
-	 */
-	public function loadContractsOfPersonNotAssigned($person_id)
-	{
-		$query = "
-SELECT
-			'Lehrauftrag' as type,
-			lehreinheit_id,
-			mitarbeiter_uid,
-			null as pruefung_id,
-			null as projektarbeit_id,
-			(tbl_lehreinheitmitarbeiter.semesterstunden*tbl_lehreinheitmitarbeiter.stundensatz) as betrag1,
-			tbl_lehreinheit.studiensemester_kurzbz,
-			null as betreuerart_kurzbz,
-			(	SELECT
-					upper(tbl_studiengang.typ || tbl_studiengang.kurzbz) || tbl_lehrveranstaltung.semester  || '-' || tbl_lehrveranstaltung.kurzbz || '-' || tbl_lehreinheit.lehrform_kurzbz
-				FROM
-					lehre.tbl_lehrveranstaltung
-					JOIN public.tbl_studiengang USING(studiengang_kz)
-				WHERE
-					lehrveranstaltung_id=tbl_lehreinheit.lehrveranstaltung_id)
-			as bezeichnung
-		FROM
-			lehre.tbl_lehreinheitmitarbeiter
-			JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
-		WHERE
-			mitarbeiter_uid IN (SELECT uid FROM public.tbl_benutzer WHERE person_id=?)
-			AND vertrag_id IS NULL
-		UNION
-		SELECT
-			'Betreuung' as type,
-			tbl_projektarbeit.lehreinheit_id as lehreinheit_id,
-			null as mitarbeiter_uid,
-			null::integer as pruefung_id,
-			projektarbeit_id,
-			(tbl_projektbetreuer.stunden*tbl_projektbetreuer.stundensatz) as betrag1,
-			tbl_lehreinheit.studiensemester_kurzbz,
-			tbl_projektbetreuer.betreuerart_kurzbz,
-			(SELECT nachname || ' ' || vorname FROM public.tbl_person JOIN public.tbl_benutzer USING(person_id) WHERE uid=tbl_projektarbeit.student_uid)
-			as bezeichnung
-		FROM
-			lehre.tbl_projektbetreuer
-			JOIN lehre.tbl_projektarbeit USING(projektarbeit_id)
-			JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
-		WHERE
-			tbl_projektbetreuer.person_id=?
-			AND vertrag_id IS NULL
-				";
-
-		return $this->execQuery($query, array($person_id, $person_id));
-	}
-
-	/**
-	 * Loads all Contracts of a Person that are assigned yet
-	 * @param $person_id, $vertrag_id
-	 * @return array of objects
-	 */
-
-	public function loadContractsOfPersonAssigned($person_id, $vertrag_id)
-	{
-		$query = "
-		SELECT
-			'Lehrauftrag' as type,
-			lehreinheit_id,
-			mitarbeiter_uid,
-			null as pruefung_id,
-			null as projektarbeit_id,
-			(tbl_lehreinheitmitarbeiter.semesterstunden * tbl_lehreinheitmitarbeiter.stundensatz) as betrag,
-			tbl_lehreinheit.studiensemester_kurzbz,
-			null as betreuerart_kurzbz,
-			(	SELECT
-					upper(tbl_studiengang.typ || tbl_studiengang.kurzbz) || tbl_lehrveranstaltung.semester  || '-' || tbl_lehrveranstaltung.kurzbz || '-' || tbl_lehreinheit.lehrform_kurzbz
-				FROM
-					lehre.tbl_lehrveranstaltung
-					JOIN public.tbl_studiengang USING(studiengang_kz)
-				WHERE
-					lehrveranstaltung_id=tbl_lehreinheit.lehrveranstaltung_id)
-			as bezeichnung, vertrag_id
-		FROM
-			lehre.tbl_lehreinheitmitarbeiter
-			JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
-		WHERE
-			mitarbeiter_uid IN (SELECT uid FROM public.tbl_benutzer WHERE person_id=?)
-			AND vertrag_id = ?
-		UNION
-		SELECT
-			'Betreuung' as type,
-			tbl_projektarbeit.lehreinheit_id as lehreinheit_id,
-			null as mitarbeiter_uid,
-			null::integer as pruefung_id,
-			projektarbeit_id,
-			(tbl_projektbetreuer.stunden * tbl_projektbetreuer.stundensatz) as betrag,
-			tbl_lehreinheit.studiensemester_kurzbz,
-			tbl_projektbetreuer.betreuerart_kurzbz,
-			(SELECT nachname || ' ' || vorname FROM public.tbl_person JOIN public.tbl_benutzer USING(person_id) WHERE uid=tbl_projektarbeit.student_uid)
-			as bezeichnung, vertrag_id
-		FROM
-			lehre.tbl_projektbetreuer
-			JOIN lehre.tbl_projektarbeit USING(projektarbeit_id)
-			JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
-		WHERE
-			tbl_projektbetreuer.person_id=?
-			AND vertrag_id = ?
-				";
-
-		return $this->execQuery($query, array($person_id, $vertrag_id, $person_id, $vertrag_id));
-	}
-
-	/**
-	 * Returns all stati of a contract
-	 *
-	 * @param $vertrag_id
-	 * @return array
-	 */
-	public function getStatiOfContract($vertrag_id)
-	{
-		$query = " 
-			SELECT
-				*,
-                tbl_vertrag_vertragsstatus.datum,
-                tbl_vertrag_vertragsstatus.insertamum,
-                tbl_vertrag_vertragsstatus.updateamum
-			FROM
-				lehre.tbl_vertrag_vertragsstatus
-				JOIN lehre.tbl_vertragsstatus USING(vertragsstatus_kurzbz)
-			WHERE
-				tbl_vertrag_vertragsstatus.vertrag_id = ?
-			ORDER BY tbl_vertrag_vertragsstatus.datum DESC";
-
-		return $this->execQuery($query, array($vertrag_id));
-	}
-
 	private function _updateVertragRelevant($vertrag_id)
 	{
 		$this->LehreinheitmitarbeiterModel->update(

application/models/accounting/Vertragstyp_model.php

@@ -11,5 +11,4 @@ class Vertragstyp_model extends DB_Model
 		$this->dbTable = 'lehre.tbl_vertragstyp';
 		$this->pk = 'vertragstyp_kurzbz';
 	}
-
 }

application/models/accounting/Vertragvertragsstatus_model.php

@@ -190,6 +190,4 @@ class Vertragvertragsstatus_model extends DB_Model
 		
 		return $this->loadWhere($condition);
 	}
-
-
 }

application/models/crm/Reihungstest_model.php

@@ -10,7 +10,7 @@ class Reihungstest_model extends DB_Model
 		parent::__construct();
 		$this->dbTable = 'public.tbl_reihungstest';
 		$this->pk = 'reihungstest_id';
-	}
+	}	
 	
 	/**
 	 * Gets a test from a test id only if it is available
@@ -42,8 +42,8 @@ class Reihungstest_model extends DB_Model
 	/**
 	 * Checks if there are active studyplans which have no public placement tests assigned yet.
 	 * Only check assignment to studyplans that are
-	 *	- Bachelor,
-	 *	- active,
+	 *	- Bachelor, 
+	 *	- active, 
 	 *	- set as online application
 	 *  - valid for 1st terms
 	 * @return array Returns object array with studyplans that have no public placement tests assigned yet.
@@ -97,7 +97,7 @@ class Reihungstest_model extends DB_Model
 					USING (reihungstest_id)
 				WHERE 
 					datum >= now() 
-				AND
+				AND 
 					oeffentlich = \'t\'
 				)
 			';
@@ -105,7 +105,7 @@ class Reihungstest_model extends DB_Model
 		return $this->execQuery($query);
 	}
 	
-	/**
+	/**	
 	 *  Gets amount of free places.
 	 * @return array Returns object array with faculty and amount of free places
 	 * for each public actual placement test date.
@@ -432,10 +432,10 @@ class Reihungstest_model extends DB_Model
 	}
 
 	/**
-	 * Loads all applicants of a placement test
-	 * @param integer $reihungstest_id ID of placement test
-	 * @return array Returns object array with data of applicants.
-	 */
+ * Loads all applicants of a placement test
+ * @param integer $reihungstest_id ID of placement test
+ * @return array Returns object array with data of applicants.
+ */
 	public function getApplicantsOfPlacementTest($reihungstest_id)
 	{
 		$query = '
@@ -556,22 +556,13 @@ class Reihungstest_model extends DB_Model
 	 * Calculates Result of Placement Test for a given Person and given placementtest
 	 * and with taking account of weighting per area
 	 *
-	 * @param Number $person_id ID of Person
-	 * @param Boolean $punkte if true result is points else result is percentage of sum
-	 * @param Number $reihungstest_id ID of Placementtest
-	 * @param Array $weightedArray array of weighting per area (gewicht per gebiet_id)
-	 * @param Boolean $has_excluded_gebiete if true, areas in the configArray will be excluded
-	 * @param Array $basis_gebiet_id_toString areas to exclude
-	 * @return float result points of RT
+	 * @param $person_id ID of Person
+	 * @param $punkte if true result is points else result is percentage of sum
+	 * @param $reihungstest_id ID of Placementtest
+	 * @param $weightedArray array of weighting per area (gewicht per gebiet_id)
+	 * @return float result
 	 */
-	public function getReihungstestErgebnisPerson(
-		$person_id,
-		$punkte,
-		$reihungstest_id,
-		$weightedArray = null,
-		$has_excluded_gebiete = false,
-		$basis_gebiet_id_toString = null
-	)
+	public function getReihungstestErgebnisPerson($person_id, $punkte, $reihungstest_id, $weightedArray = null)
 	{
 		$parametersArray = array($reihungstest_id);
 
@@ -586,35 +577,6 @@ class Reihungstest_model extends DB_Model
 				WHERE
 					reihungstest_id = ? ";
 
-		//areas of Studiengang
-		if (!empty($basis_gebiet_id_toString))
-		{
-			$qry .= "
-				AND
-					gebiet_id IN (". $basis_gebiet_id_toString. ")
-			";
-		}
-
-		//areas to exclude
-		if($has_excluded_gebiete)
-		{
-			if (defined('FAS_REIHUNGSTEST_EXCLUDE_GEBIETE') && !empty(FAS_REIHUNGSTEST_EXCLUDE_GEBIETE))
-			{
-				$excluded_gebiete = unserialize(FAS_REIHUNGSTEST_EXCLUDE_GEBIETE);
-				$exclude_gebiet_id_arr = $excluded_gebiete;
-				if (is_array($exclude_gebiet_id_arr) && count($exclude_gebiet_id_arr) > 0)
-				{
-					$exclude_gebiet_id_toString = implode(', ', $exclude_gebiet_id_arr);
-					$qry .= "
-							AND
-								gebiet_id NOT IN (". $exclude_gebiet_id_toString. ")
-						--	AND
-						--		typ = 'b'
-						";
-				}
-			}
-		}
-
 		//using prestudent Status to avoid to get the sum of more than 1 placement tests
 		$qry .= "
 				AND prestudent_id = (

application/models/ressource/Mitarbeiter_model.php

@@ -209,7 +209,7 @@ class Mitarbeiter_model extends DB_Model
 	{
 		$qry = "
 			SELECT
-			  titelpre, vorname, nachname, titelpost, foto, foto_sperre, person_id, alias, telefonklappe, personalnummer, mitarbeiter_uid
+			  titelpre, vorname, nachname, titelpost, foto, foto_sperre, person_id, alias, telefonklappe
 			FROM
 				public.tbl_person
 				JOIN public.tbl_benutzer b USING(person_id)
@@ -363,14 +363,14 @@ class Mitarbeiter_model extends DB_Model
 			$returnwert .= ", ma.mitarbeiter_uid, CONCAT(p.nachname, ' ', p.vorname, ' (', ma.mitarbeiter_uid , ')') as mitarbeiter";
 
 		$qry = "
-			SELECT " . $returnwert . "
-			FROM
+			SELECT " . $returnwert . "  
+			FROM 
 				public.tbl_mitarbeiter ma
-			JOIN
+			JOIN 
 				public.tbl_benutzer b on (ma.mitarbeiter_uid = b.uid)
-			JOIN
+			JOIN 
 				public.tbl_person p on (p.person_id = b.person_id)
-			WHERE
+			WHERE 
 				lower (p.nachname) LIKE '%". $this->db->escape_like_str($filter)."%'
 			OR
 				lower (p.vorname) LIKE '%". $this->db->escape_like_str($filter)."%'
@@ -393,14 +393,14 @@ class Mitarbeiter_model extends DB_Model
 	public function getMitarbeiterFromLV($lehrveranstaltung_id)
 	{
 		$qry = "SELECT DISTINCT
-				lehrveranstaltung_id, uid, vorname, wahlname, vornamen, nachname, titelpre, titelpost, kurzbz, mitarbeiter_uid
-			FROM
+				lehrveranstaltung_id, uid, vorname, wahlname, vornamen, nachname, titelpre, titelpost, kurzbz, mitarbeiter_uid 
+			FROM 
 				lehre.tbl_lehreinheitmitarbeiter, campus.vw_mitarbeiter, lehre.tbl_lehreinheit
-			WHERE
+			WHERE 
 				lehrveranstaltung_id= ?
-			AND
-				mitarbeiter_uid=uid
-			AND
+			AND 
+				mitarbeiter_uid=uid 
+			AND 
 				tbl_lehreinheitmitarbeiter.lehreinheit_id=tbl_lehreinheit.lehreinheit_id;";
 
 		$parametersArray = array($lehrveranstaltung_id);

application/views/Cis/LvInfo.php

@@ -0,0 +1,15 @@
+<?php
+$includesArray = array(
+	'title' => 'LvInfo',
+	'customJSModules' => ['public/js/apps/Cis/LvInfo.js']
+);
+
+$this->load->view('templates/CISVUE-Header', $includesArray);
+?>
+
+<div id="content">
+	<Info studien_semester="<?= $studien_semester ?>" lehrveranstaltung_id="<?= $lvid ?>"></Info>
+	
+</div>
+
+<?php $this->load->view('templates/CISVUE-Footer', $includesArray); ?>

application/views/Cis/Profil.php

@@ -0,0 +1,18 @@
+<?php
+$includesArray = array(
+	'title' => 'Profil',
+	'customJSModules' => ['public/js/apps/Cis/Profil.js'],
+	'tabulator5' => true,
+	'primevue3' => true,
+	'customCSSs' => ['public/css/components/calendar.css', 'public/css/components/FilterComponent.css','public/css/components/Profil.css','public/css/components/FormUnderline.css'],
+	
+);
+
+$this->load->view('templates/CISVUE-Header', $includesArray);
+?>
+
+<div id="content" >
+
+</div>
+
+<?php $this->load->view('templates/CISVUE-Footer', $includesArray); ?>

application/views/Studentenverwaltung.php

@@ -7,21 +7,19 @@
 		'vue3' => true,
 		'primevue3' => true,
 		#'filtercomponent' => true,
-		'tabulator6' => true,
+		'tabulator5' => true,
 		'tinymce5' => true,
 		'phrases' => array(
 			'global',
 			'ui',
 			'notiz',
 		),
-		'tags' => true,
 		'customCSSs' => [
 			#datepicker fuer component functions
 			'public/css/components/vue-datepicker.css',
 			'public/css/components/primevue.css',
 			'public/css/Studentenverwaltung.css',
-			'public/css/components/function.css',
-			'public/css/components/Detailheader.css'
+			'public/css/components/function.css'
 		],
 		'customJSs' => [
 			'vendor/vuejs/vuedatepicker_js/vue-datepicker.iife.js',
@@ -47,8 +45,6 @@ $configArray = [
 	'showAufnahmegruppen' => !defined('FAS_REIHUNGSTEST_AUFNAHMEGRUPPEN') ? false : FAS_REIHUNGSTEST_AUFNAHMEGRUPPEN,
 	'allowUebernahmePunkte' => !defined('FAS_REIHUNGSTEST_PUNKTEUEBERNAHME') ? true : FAS_REIHUNGSTEST_PUNKTEUEBERNAHME,
 	'useReihungstestPunkte' => !defined('FAS_REIHUNGSTEST_PUNKTE') ? true : FAS_REIHUNGSTEST_PUNKTE,
-	'hasExcludedAreas' => defined('FAS_REIHUNGSTEST_EXCLUDE_GEBIETE') && !empty(FAS_REIHUNGSTEST_EXCLUDE_GEBIETE),
-	'stvTagsEnabled' => defined('STV_TAGS_ENABLED') ? STV_TAGS_ENABLED : false,
 ];
 ?>
 

application/views/Vertragsverwaltung.php

@@ -1,50 +0,0 @@
-<?php
-$includesArray = array(
-	'title' => 'Vertragsverwaltung',
-	'axios027' => true,
-	'bootstrap5' => true,
-	'fontawesome6' => true,
-	'vue3' => true,
-	'primevue3' => true,
-	'filtercomponent' => true,
-	'navigationcomponent' => true,
-	'tabulator6' => true,
-	'tinymce5' => true,
-	'phrases' => array(
-		'global',
-		'ui',
-	),
-	'customCSSs' => [
-		'public/css/components/vue-datepicker.css',
-		'public/css/components/primevue.css',
-		'public/css/Vertragsverwaltung.css',
-		'public/css/components/Detailheader.css'
-	],
-	'customJSs' => [
-		#'vendor/npm-asset/primevue/tree/tree.min.js',
-		#'vendor/npm-asset/primevue/toast/toast.min.js'
-	],
-	'customJSModules' => [
-		'public/js/apps/Vertragsverwaltung.js'
-	]
-);
-
-$this->load->view('templates/FHC-Header', $includesArray);
-?>
-
-<?php
-$configArray = [
-	'domain' => !defined('DOMAIN') ? 'notDefined' : DOMAIN,
-];
-?>
-
-<div id="main">
-	<router-view
-		:permissions="<?= htmlspecialchars(json_encode($permissions)); ?>"
-		:config="<?=  htmlspecialchars(json_encode($configArray)); ?>"
-	>
-	</router-view>
-</div>
-
-<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
-

application/views/templates/FHC-Footer.php

@@ -17,7 +17,6 @@
 	$use_vuejs_dev_version = $this->config->item('use_vuejs_dev_version');
 
 	// By default set the parameters to null
-	$customCSSs = isset($customCSSs) ? $customCSSs : null;
 	$customJSs = isset($customJSs) ? $customJSs : null;
 	$customJSModules = isset($customJSModules) ? $customJSModules : null;
 
@@ -192,13 +191,12 @@
 	// NOTE: keep it as the last but one
 	if ($addons === true) generateAddonsJSsInclude($calledPath.'/'.$calledMethod);
 
-	$extapphelper = ExtendableAppsHelper::getInstance();
-	$extapphelper->init($customCSSs, $customJSs, $customJSModules);
-
+	
+	
 	// Eventually required JS
 	// NOTE: keep it as the latest
-	generateJSsInclude($extapphelper->getCustomJSs());
-	generateJSModulesInclude($extapphelper->getCustomJSModules());
+	generateJSsInclude($customJSs);
+	generateJSModulesInclude($customJSModules);
 ?>
 	</body>
 </html>

application/views/templates/FHC-Header.php

@@ -9,8 +9,6 @@
 	$title = isset($title) ? $title : null;
 	$refresh = isset($refresh) ? $refresh : null;
 	$customCSSs = isset($customCSSs) ? $customCSSs : null;
-	$customJSs = isset($customJSs) ? $customJSs : null;
-	$customJSModules = isset($customJSModules) ? $customJSModules : null;
 	$skipID = isset($skipID) ? $skipID : null;
 ?>
 <!-- Header start -->
@@ -134,11 +132,8 @@
 			//Tags
 			if ($tags === true) generateCSSsInclude('public/css/tags.css');
 
-			$extapphelper = ExtendableAppsHelper::getInstance();
-			$extapphelper->init($customCSSs, $customJSs, $customJSModules);
-
 			// Eventually required CSS
-			generateCSSsInclude($extapphelper->getCustomCSSs()); // Eventually required CSS
+			generateCSSsInclude($customCSSs); // Eventually required CSS
 		?>
 	</head>
 	<body>

cis/private/lehre/notenliste.xls.php

@@ -264,7 +264,7 @@ else
 		tbl_bisio.bisio_id, tbl_bisio.bis, tbl_bisio.von,
 		tbl_zeugnisnote.note,tbl_mobilitaet.mobilitaetstyp_kurzbz,
 		(CASE WHEN bis.tbl_mobilitaet.studiensemester_kurzbz = vw_student_lehrveranstaltung.studiensemester_kurzbz THEN '1' ELSE '' END) as doubledegree,
-		tbl_note.lkt_ueberschreibbar, tbl_note.anmerkung, tbl_zeugnisnote.punkte
+		tbl_note.lkt_ueberschreibbar, tbl_note.anmerkung
 	FROM
 		campus.vw_student_lehrveranstaltung JOIN public.tbl_benutzer USING(uid)
 		JOIN public.tbl_person USING(person_id) JOIN public.tbl_student ON(uid=student_uid)
@@ -306,14 +306,7 @@ else
 						&& $elem->von < $stsemdatumbis &&	(anzahlTage($elem->von, $elem->bis) >= 30))
 							$inc.=' (o)';
 
-					if(defined('CIS_GESAMTNOTE_PUNKTE') && CIS_GESAMTNOTE_PUNKTE==true)
-					{
-						$note = $elem->punkte;
-					}
-					else
-					{
-						$note = $elem->note;
-					}
+					$note = $elem->note;
 
 					if($elem->lkt_ueberschreibbar == 'f') // angerechnet / intern angerechnet / nicht zugelassen
 					{
@@ -346,23 +339,20 @@ else
 					{
 						$worksheet->write($lines,8, trim($elem->matrikelnr), $format_highlight);
 						$pr = new Pruefung();
-						$pr->getPruefungen($elem->uid, "Termin2", $lvid, $stsem);
+						$pr->getPruefungen($elem->uid, "Termin2", $lvid, $sem);
 						$output2 = $pr->result;
 
 						if ($output2)
 						{
 							$resultPr = $output2[0];
 							$worksheet->write($lines,9, date('d.m.Y', strtotime($resultPr->datum)), $format_highlightright_date);
-							if(defined('CIS_GESAMTNOTE_PUNKTE') && CIS_GESAMTNOTE_PUNKTE==true)
-								$worksheet->write($lines,10, $resultPr->punkte, $format_highlightright);
-							else
-								$worksheet->write($lines,10, $resultPr->note, $format_highlightright);
-						}
-						else
-						{
-								$worksheet->write($lines,9, '', $format_highlightright_date);
-								$worksheet->write($lines,10, '', $format_highlightright);
+							$worksheet->write($lines,10, $resultPr->note, $format_highlightright);
 						}
+                                                else
+                                                {
+                                                        $worksheet->write($lines,9, '', $format_highlightright_date);
+                                                        $worksheet->write($lines,10, '', $format_highlightright);
+                                                }
 					}
 
 					// Nachprüfung
@@ -370,23 +360,20 @@ else
 					{
 						$worksheet->write($lines,12, trim($elem->matrikelnr), $format_highlight);
 						$pr = new Pruefung();
-						$pr->getPruefungen($elem->uid, "Termin3", $lvid, $stsem);
+						$pr->getPruefungen($elem->uid, "Termin3", $lvid, $sem);
 						$output3 = $pr->result;
 
 						if ($output3)
 						{
 							$resultPr = $output3[0];
 							$worksheet->write($lines,13, date('d.m.Y', strtotime($resultPr->datum)), $format_highlightright_date);
-							if(defined('CIS_GESAMTNOTE_PUNKTE') && CIS_GESAMTNOTE_PUNKTE==true)
-								$worksheet->write($lines,14, $resultPr->punkte, $format_highlightright);
-							else
-								$worksheet->write($lines,14, $resultPr->note, $format_highlightright);
-						}
-						else
-						{
-								$worksheet->write($lines,13, '', $format_highlightright_date);
-								$worksheet->write($lines,14, '', $format_highlightright);
+							$worksheet->write($lines,14, $resultPr->note, $format_highlightright);
 						}
+                                                else
+                                                {
+                                                        $worksheet->write($lines,13, '', $format_highlightright_date);
+                                                        $worksheet->write($lines,14, '', $format_highlightright);
+                                                }
 					}
 
 					$i++;

config/global.config-default.inc.php

@@ -371,6 +371,4 @@ define('STATUS_VORRUECKEN_ANZEIGEN', true);
 //externe Ueberwachung im Testtool erlauben
 define('TESTTOOL_EXTERNE_UEBERWACHUNG_ALLOWED', false);
 
-//enable tags in StudVW
-define('STV_TAGS_ENABLED', false);
 ?>

content/student/studentdetailoverlay.xul.php

@@ -798,10 +798,6 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 									class="sortDirectionIndicator"
 									sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#updatevon" />
 								<splitter class="tree-splitter"/>
-								<treecol id="student-prestudent-tree-rolle-fgm" label="FGM" flex="1" hidden="true" persist="hidden, width, ordinal"
-									class="sortDirectionIndicator"
-									sort="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#fgm" />
-								<splitter class="tree-splitter"/>
 							</treecols>
 
 							<template>
@@ -827,7 +823,6 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#insertvon"/>
 												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#updateamum"/>
 												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#updatevon"/>
-												<treecell properties="Aktiv_rdf:http://www.technikum-wien.at/prestudentrolle/rdf#aktiv rdf:http://www.technikum-wien.at/prestudentrolle/rdf#stichtagsaktiv" label="rdf:http://www.technikum-wien.at/prestudentrolle/rdf#fgm"/>
 											</treerow>
 										</treeitem>
 									</treechildren>

include/lehrelisthelper.class.php

@@ -270,8 +270,6 @@ class LehreListHelper
 					} else if ($row->bisio_id != '' && $row->status != 'Incoming' && ($row->von > $stsemdatumvon || $row->von == '')) {
 						// if bis datum is not yet known but von is available already
 						$zusatz .= '(o)(ab '.$datum->formatDatum($row->von, 'd.m.Y').')';
-					} else if ($row->bisio_id != '' && $row->status != 'Incoming' && ($row->von <= $stsemdatumvon || $row->von == '') && ($row->bis == '' || $row->bis > date('Y-m-d'))){
-						$zusatz .= '(o)(ab '.$datum->formatDatum($row->von, 'd.m.Y').')';
 					}
 						
 

include/prestudent.class.php

@@ -705,7 +705,6 @@ class prestudent extends person
 				$rolle->studienplan_bezeichnung = $row->studienplan_bezeichnung;
 				$rolle->bestaetigtam = $row->bestaetigtam;
 				$rolle->bestaetigtvon = $row->bestaetigtvon;
-				$rolle->fgm = $row->fgm;
 				$rolle->anmerkung_status = $row->anmerkung;
 				$rolle->bewerbung_abgeschicktamum = $row->bewerbung_abgeschicktamum;
 				$rolle->rt_stufe = $row->rt_stufe;

public/css/Studentenverwaltung.css

@@ -12,22 +12,22 @@ html {
   font-size: .875em;
 }
 html.fs_xx-small {
-	font-size: .625em;
+	font-size: .5em;
 }
 html.fs_x-small {
-	font-size: .6875em;
+	font-size: .625em;
 }
 html.fs_small {
 	font-size: .75em;
 }
 html.fs_normal {
-	font-size: .8125em;
+  font-size: .875em;
 }
 html.fs_big {
-	font-size: .875em;
+  font-size: 1em;
 }
 html.fs_huge {
-	font-size: 1em;
+	font-size: 1.125em;
 }
 
 #appMenu {
@@ -74,12 +74,6 @@ html.fs_huge {
 	color: var(--gray-500);
 }
 
-/* Aufnahme Termine: background color green*/
-.stv-details-admission-table .row-green{
-    background-color: lightgreen !important;
-    //color: var(--green-200);
-}
-
 /* Dropdown Toolbar Interessent, submenu */
 .dropend .dropdown-toggle.d-flex::after {
 	height: 0;
@@ -122,15 +116,6 @@ html.fs_huge {
 		position: inherit;
 		z-index: 1;
 	}
-
-	.sidebar-collapsed #sidebarMenu {
-		display: none !important;
-	}
-
-	.sidebar-collapsed .container-fluid > .row > main {
-		flex: 0 0 100%;
-		max-width: 100%;
-	}
 }
 
 
@@ -183,7 +168,7 @@ html.fs_huge {
 }
 
 .has-filter .fa-filter {
-	color: var(--bs-danger);
+	color: var(--bs-success);
 }
 .override_filtercmpt_actions_style div.d-flex.align-items-baseline {
 	align-items: end !important;
@@ -200,84 +185,3 @@ html.fs_huge {
 .tiny-90 div.tox.tox-tinymce {
 	height: 90% !important;
 }
-
-/* slim begin */
-.stv .form-label {
-	margin-bottom: .15rem;
-	font-weight: bold;
-}
-
-.stv .form-control,
-.stv .form-select,
-.stv .input-group-text {
-	padding-top: .15rem;
-	padding-bottom: .15rem;
-}
-
-:root {
-	--bs-body-line-height: 1.2;
-}
-
-.stv .tabulator-row .tabulator-cell,
-.stv .tabulator-header-filter input {
-	padding-top: 1px !important;
-	padding-bottom: 1px !important;
-}
-
-.stv .tabulator-row {
-	min-height: 18px;
-}
-
-.stv .btn {
-	--bs-btn-padding-y: 0.25rem;
-	--bs-btn-line-height: 1.2;
-}
-
-.stv .p-button.p-button-icon-only {
-	padding-top: 0;
-	padding-bottom: 0;
-}
-
-.stv .p-tabview .p-tabview-nav li .p-tabview-nav-link {
-	padding: 0.25rem .5rem;
-}
-/*
-.stv .p-tabview .p-tabview-panels {
-	background-color: #e5eff5;
-}
-
-.stv .p-tabview .p-tabview-nav li.p-highlight .p-tabview-nav-link {
-	background: #e5eff5;
-	border-color: #dee2e6 #dee2e6 #e5eff5 #dee2e6;
-}
-*/
-.stv-details-details-foto img {
-	max-height: 120px;
-}
-
-.stv .tabulator-row .tabulator-frozen,
-.stv .tabulator-row .tabulator-cell {
-	border-bottom: none;
-}
-
-/*
-.stv .p-treetable .p-treetable-thead > tr > th,
-.stv .p-treetable .p-treetable-tbody > tr {
-	background-color: #e5eff5;
-}
-
-.stv .p-treetable .p-treetable-tbody > tr.p-highlight {
-	background: #007bff;
-	color: #fff;
-}
-
-.stv .p-treetable.p-treetable-hoverable-rows .p-treetable-tbody > tr:not(.p-highlight):hover {
-	background: #fff;
-	color: #212529;
-}
-
-.tabulator-row.tabulator-row-even .tabulator-cell {
-	background-color: #e5eff5;
-}
-*/
-/* slim ende */

public/css/Vertragsverwaltung.css

@@ -1,20 +0,0 @@
-@import './components/verticalsplit.css';
-
-html {
-  font-size: .875em;
-}
-.vv{
-	display: flex;
-	flex-direction: column;
-	height: 100vh;
-}
-.vv> header {
-	flex: 0 0 auto;
-}
-.vv> div {
-	flex: 1 1 auto;
-}
-
-.vv {
-	margin-left: 0 !important;
-}

public/css/components/Detailheader.css

@@ -1,64 +0,0 @@
-.foto-container:hover .fotoedit {
-    opacity: 1 !important;
-}
-
-.bg-unruly {
-    background-color: #ad1010 !important;
-    color: white;
-}
-
-/*.fotosperre {
-    z-index: 1;
-    font-size: 1rem;
-    width: 1.25rem;
-    height: 1.25rem;
-}*/
-
-.foto-container .fotoedit {
-    opacity: 0;
-    transition: opacity 0.3s;
-    backdrop-filter: blur(2px);
-}
-
-.fotoedit {
-    background-color: rgba(0, 0, 0, 0.4);
-    color: white;
-    border: none;
-    z-index: 4;
-    font-size: 1rem;
-    width: 1.8rem;
-    height: 1.8rem;
-    opacity:0;
-    transition: opacity 0.2s;
-    top:20%;
-}
-
-/* fotoeditMa {
-    background-color: rgba(0, 0, 0, 0.4);
-    color: white;
-    border: none;
-    z-index: 4;
-    font-size: 1rem;
-    opacity:0;
-    transition: opacity 0.2s;
-    top:20%;
-}*/
-
-.buttonleft {
-    margin-left: .25rem;
-}
-
-.buttonright {
-    margin-right: .25rem;
-}
-
-/*.fotoEditMa {
-    z-index: 104;
-    font-size: 1rem;
-    width: 2.5rem;
-    height: 2.5rem;
-    opacity:0;
-    transition: opacity 0.2s;
-    top:13%;"
-    z-index: 104; font-size: 1rem; width: 2.5rem; height: 2.5rem; opacity:0; transition: opacity 0.2s; top:13%;"
-}*/

public/css/components/primevue.css

@@ -3578,12 +3578,6 @@
   transition: box-shadow 0.15s;
   margin-right: 0.5rem;
 }
-
-.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler > svg,
-.p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler > svg * {
-  pointer-events: none;
-}
-
 .p-treetable .p-treetable-tbody > tr > td .p-treetable-toggler:enabled:hover {
   color: #495057;
   border-color: transparent;

public/js/FhcApps.js

@@ -1,50 +0,0 @@
-/**
- * Copyright (C) 2025 fhcomplete.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-
-const FhcApps = (function() {
-	// Logic to extend app here (like adding components, plugins, ...)
-
-	function makeExtendable(app) {
-		// apply extensions here
-		return app;
-	}
-
-	return {
-		makeExtendable
-	};
-})();
-
-FhcApps.router = (() => {
-	const extraRoutes = [];
-
-	function addRoute(...route) {
-		extraRoutes.push(route);
-	}
-
-	function makeExtendable(router) {
-		while (extraRoutes.length) {
-			router.addRoute(...extraRoutes.shift());
-		}
-		router.replace(router.currentRoute.value.fullPath);
-	}
-
-	return {
-		addRoute,
-		makeExtendable
-	};
-})();

public/js/api/factory/cis/studium.js

@@ -1,38 +0,0 @@
-/**
- * Copyright (C) 2026 fhcomplete.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-export default {
-	getAllStudienSemester(studiensemester, studiengang, semester, studienplan) {
-		return {
-			method: 'get',
-			url: 'api/frontend/v1/Studium/getStudienAllSemester/',
-			params: {studiensemester, studiengang, semester, studienplan}
-		};
-	},
-	getLvPlanForStudiensemester(studiensemester, lvid) {
-		return {
-			method: 'get',
-			url: '/api/frontend/v1/LvPlan/getLvPlanForStudiensemester/'+ studiensemester + '/' + lvid
-		};
-	},
-	getLvEvaluierungInfo(studiensemester_kurzbz, lvid) {
-		return {
-			method: 'get',
-			url: 'api/frontend/v1/Studium/getLvEvaluierungInfo/' + studiensemester_kurzbz + '/' + lvid
-		};
-	},
-}

public/js/api/factory/detailHeader.js

@@ -19,19 +19,19 @@ export default {
 	getHeader(person_id){
 		return {
 			method: 'get',
-			url: 'api/frontend/v1/detailheader/detailheader/getHeader/' + person_id,
+			url: 'api/frontend/v1/vertraege/vertraege/getHeader/' + person_id,
 		};
 	},
 	getPersonAbteilung(mitarbeiter_uid){
 		return {
 			method: 'get',
-			url: 'api/frontend/v1/detailheader/detailheader/getPersonAbteilung/' + mitarbeiter_uid,
+			url: 'api/frontend/v1/vertraege/vertraege/getPersonAbteilung/' + mitarbeiter_uid,
 		};
 	},
 	getLeitungOrg(oekurzbz){
 		return {
 			method: 'get',
-			url: 'api/frontend/v1/detailheader/detailheader/getLeitungOrg/' + oekurzbz,
+			url: 'api/frontend/v1/vertraege/vertraege/getLeitungOrg/' + oekurzbz,
 		};
 	},
 }

public/js/api/factory/fotoHandling.js

@@ -1,32 +0,0 @@
-/**
- * Copyright (C) 2025 fhcomplete.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-export default {
-	uploadFoto(person_id, params) {
-		return {
-			method: 'post',
-			url: 'api/frontend/v1/fotoHandling/Foto/uploadFoto/' + person_id,
-			params
-		};
-	},
-	deleteFoto(person_id){
-		return {
-			method: 'post',
-			url: 'api/frontend/v1/fotoHandling/Foto/deleteFoto/' + person_id
-		};
-	}
-}

public/js/api/factory/notiz/anrechnung.js

@@ -1,29 +0,0 @@
-/**
- * Copyright (C) 2025 fhcomplete.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-import Person from './person.js';
-
-export default {
-
-	...Person,
-	getNotizen(id, type) {
-		return {
-			method: 'get',
-			url: 'api/frontend/v1/notiz/notizAnrechnung/getNotizen/' + encodeURIComponent(id) + '/' + encodeURIComponent(type)
-		};
-	},
-};

public/js/api/factory/notiz/bestellung.js

@@ -1,29 +0,0 @@
-/**
- * Copyright (C) 2025 fhcomplete.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-import Person from './person.js';
-
-export default {
-
-	...Person,
-	getNotizen(id, type) {
-		return {
-			method: 'get',
-			url: 'api/frontend/v1/notiz/notizBestellung/getNotizen/' + encodeURIComponent(id) + '/' + encodeURIComponent(type)
-		};
-	},
-};

public/js/api/factory/notiz/lehreinheit.js

@@ -26,29 +26,4 @@ export default {
 			url: 'api/frontend/v1/notiz/notizLehreinheit/getNotizen/' + encodeURIComponent(id) + '/' + encodeURIComponent(type)
 		};
 	},
-	addNewNotiz(lehreinheit_id, params) {
-		return {
-			method: 'post',
-			url: 'api/frontend/v1/notiz/notizLehreinheit/addNewNotiz/' + lehreinheit_id,
-			params
-		};
-	},
-	updateNotiz(notiz_id, params) {
-		return {
-			method: 'post',
-			url: 'api/frontend/v1/notiz/notizLehreinheit/updateNotiz/' + notiz_id,
-			params
-		};
-	},
-	deleteNotiz(notiz_id, type_id, id) {
-		return {
-			method: 'post',
-			url: 'api/frontend/v1/notiz/notizLehreinheit/deleteNotiz/',
-			params: {
-				notiz_id,
-				type_id,
-				id
-			}
-		};
-	},
 };

public/js/api/factory/notiz/mitarbeiter.js

@@ -1,29 +0,0 @@
-/**
- * Copyright (C) 2025 fhcomplete.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-import Person from './person.js';
-
-export default {
-
-	...Person,
-	getNotizen(id, type) {
-		return {
-			method: 'get',
-			url: 'api/frontend/v1/notiz/notizMitarbeiter/getNotizen/' + encodeURIComponent(id) + '/' + encodeURIComponent(type)
-		};
-	},
-};

public/js/api/factory/notiz/prestudent.js

@@ -1,29 +0,0 @@
-/**
- * Copyright (C) 2025 fhcomplete.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-import Person from './person.js';
-
-export default {
-
-	...Person,
-	getNotizen(id, type) {
-		return {
-			method: 'get',
-			url: 'api/frontend/v1/notiz/notizPrestudent/getNotizen/' + encodeURIComponent(id) + '/' + encodeURIComponent(type)
-		};
-	},
-};

public/js/api/factory/notiz/projekt.js

@@ -1,29 +0,0 @@
-/**
- * Copyright (C) 2025 fhcomplete.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-import Person from './person.js';
-
-export default {
-
-	...Person,
-	getNotizen(id, type) {
-		return {
-			method: 'get',
-			url: 'api/frontend/v1/notiz/notizProjekt/getNotizen/' + encodeURIComponent(id) + '/' + encodeURIComponent(type)
-		};
-	},
-};

public/js/api/factory/notiz/projektphase.js

@@ -1,29 +0,0 @@
-/**
- * Copyright (C) 2025 fhcomplete.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-import Person from './person.js';
-
-export default {
-
-	...Person,
-	getNotizen(id, type) {
-		return {
-			method: 'get',
-			url: 'api/frontend/v1/notiz/notizProjektphase/getNotizen/' + encodeURIComponent(id) + '/' + encodeURIComponent(type)
-		};
-	},
-};

public/js/api/factory/notiz/projekttask.js

@@ -1,29 +0,0 @@
-/**
- * Copyright (C) 2025 fhcomplete.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-import Person from './person.js';
-
-export default {
-
-	...Person,
-	getNotizen(id, type) {
-		return {
-			method: 'get',
-			url: 'api/frontend/v1/notiz/notizProjekttask/getNotizen/' + encodeURIComponent(id) + '/' + encodeURIComponent(type)
-		};
-	},
-};

public/js/api/factory/stv/documents.js

@@ -60,6 +60,7 @@ export default {
 		};
 	},
 	deleteFile(akte_id){
+		console.log("in deleteFile " + akte_id);
 		return {
 			method: 'post',
 			url: 'api/frontend/v1/stv/dokumente/deleteAkte/' + akte_id,

public/js/api/factory/stv/tag.js

@@ -1,54 +0,0 @@
-export default {
-
-	getTag(data)
-	{
-		return {
-			method: 'get',
-			url: 'api/frontend/v1/stv/Tags/getTag',
-			params: data
-		};
-	},
-
-	getTags(data)
-	{
-		return {
-			method: 'get',
-			url: 'api/frontend/v1/stv/Tags/getTags'
-		};
-	},
-
-	addTag(data)
-	{
-		return {
-			method: 'post',
-			url: 'api/frontend/v1/stv/Tags/addTag',
-			params: data
-		};
-	},
-
-	updateTag(data)
-	{
-		return {
-			method: 'post',
-			url: 'api/frontend/v1/stv/Tags/updateTag',
-			params: data
-		};
-	},
-	doneTag(data)
-	{
-		return {
-			method: 'post',
-			url: 'api/frontend/v1/stv/Tags/doneTag',
-			params: data
-		};
-	},
-
-	deleteTag(data)
-	{
-		return {
-			method: 'post',
-			url: 'api/frontend/v1/stv/Tags/deleteTag',
-			params: data
-		};
-	},
-};

public/js/api/factory/vertraege/vertraege.js

@@ -1,136 +0,0 @@
-/**
- * Copyright (C) 2025 fhcomplete.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-export default {
-	getAllVertraege(person_id) {
-		return {
-			method: 'get',
-			url: 'api/frontend/v1/vertraege/Vertraege/getAllVertraege/' + person_id
-		};
-	},
-	getAllContractsNotAssigned(person_id) {
-		return {
-			method: 'get',
-			url: 'api/frontend/v1/vertraege/Vertraege/getAllContractsNotAssigned/' + person_id
-		};
-	},
-	getAllContractsAssigned(person_id, vertrag_id) {
-		return {
-			method: 'get',
-			url: 'api/frontend/v1/vertraege/Vertraege/getAllContractsAssigned/' + person_id + '/' + vertrag_id + ''
-		};
-	},
-	getAllContractTypes() {
-		return {
-			method: 'get',
-			url: 'api/frontend/v1/vertraege/Vertraege/getAllContractTypes/'
-		};
-	},
-	getStatiOfContract(person_id, vertrag_id){
-		return {
-			method: 'get',
-			url: 'api/frontend/v1/vertraege/Vertraege/getStatiOfContract/' + person_id + '/' + vertrag_id
-		};
-	},
-	configPrintDocument() {
-		return {
-			method: 'get',
-			url: 'api/frontend/v1/vertraege/Config/printDocument/'
-		};
-	},
-	getAllContractStati() {
-		return {
-			method: 'get',
-			url: 'api/frontend/v1/vertraege/vertraege/getAllContractStati/'
-		};
-	},
-	deleteContract(vertrag_id) {
-		return {
-			method: 'post',
-			url: 'api/frontend/v1/vertraege/vertraege/deleteContract/' + vertrag_id
-		};
-	},
-	addNewContract(params) {
-		return {
-			method: 'post',
-			url: 'api/frontend/v1/vertraege/vertraege/addNewContract/',
-			params
-		};
-	},
-	loadContract(vertrag_id){
-		return {
-			method: 'get',
-			url: 'api/frontend/v1/vertraege/vertraege/loadContract/' + vertrag_id
-		};
-	},
-	updateContract(params) {
-		return {
-			method: 'post',
-			url: 'api/frontend/v1/vertraege/vertraege/updateContract/',
-			params
-		};
-	},
-	loadContractStatus(params){
-		return {
-			method: 'get',
-			url: 'api/frontend/v1/vertraege/vertraege/loadContractStatus/',
-			params
-		};
-	},
-	insertContractStatus(params) {
-		return {
-			method: 'post',
-			url: 'api/frontend/v1/vertraege/vertraege/insertContractStatus/',
-			params
-		};
-	},
-	updateContractStatus(params) {
-		return {
-			method: 'post',
-			url: 'api/frontend/v1/vertraege/vertraege/updateContractStatus/',
-			params
-		};
-	},
-	deleteContractStatus(params) {
-		return {
-			method: 'post',
-			url: 'api/frontend/v1/vertraege/vertraege/deleteContractStatus/',
-			params
-		};
-	},
-	deleteLehrauftrag(params) {
-		return {
-			method: 'post',
-			url: 'api/frontend/v1/vertraege/vertraege/deleteLehrauftrag/',
-			params
-		};
-	},
-	deleteBetreuung(params) {
-		return {
-			method: 'post',
-			url: 'api/frontend/v1/vertraege/vertraege/deleteBetreuung/',
-			params
-		};
-	},
-	//loaded by mitarbeiter_header_js
-	getMitarbeiter(){
-		return {
-			method: 'get',
-			url: 'api/frontend/v1/vertraege/vertraege/getMitarbeiter/',
-		};
-	},
-};

public/js/api/fhcapifactory.js

@@ -39,7 +39,6 @@ import studiengang from "./studiengang.js";
 import menu from "./menu.js";
 import dashboard from "./dashboard.js";
 import authinfo from "./authinfo.js";
-import vertraege from "./vertraege.js";
 import studium from "./studium.js";
 import language from "./language.js";
 
@@ -69,7 +68,6 @@ export default {
 	studiengang,
 	menu,
 	authinfo,
-	vertraege,
 	studium,
-	language
+    language
 };

public/js/api/notiz.js

@@ -1,22 +1,5 @@
 import person from "./notiz/person.js";
-import prestudent from "./notiz/prestudent.js";
-import mitarbeiter from "./notiz/mitarbeiter.js";
-import projekt from "./notiz/projekt.js";
-import anrechnung from "./notiz/anrechnung.js";
-import bestellung from "./notiz/bestellung.js";
-import lehreinheit from "./notiz/lehreinheit.js";
-import projektphase from "./notiz/projektphase.js";
-import projekttask from "./notiz/projekttask.js";
-
 
 export default {
-	person,
-	prestudent,
-	mitarbeiter,
-	anrechnung,
-	bestellung,
-	lehreinheit,
-	projekt,
-	projektphase,
-	projekttask,
-}
+	person
+}

public/js/api/notiz/anrechnung.js

@@ -1,38 +0,0 @@
-export default {
-	getNotizen(url, config, params){
-		return this.$fhcApi.get('api/frontend/v1/notiz/notizAnrechnung/getNotizen/' + params.id + '/' + params.type);
-	},
-	getUid(){
-		return this.$fhcApi.get('api/frontend/v1/notiz/notizAnrechnung/getUid/');
-	},
-	addNewNotiz(id, formData) {
-		return this.$fhcApi.post('api/frontend/v1/notiz/notizAnrechnung/addNewNotiz/' + id,
-			formData
-		);
-	},
-	loadNotiz(notiz_id){
-		return this.$fhcApi.post('api/frontend/v1/notiz/notizAnrechnung/loadNotiz/', {
-			notiz_id
-		});
-	},
-	loadDokumente(notiz_id){
-		return this.$fhcApi.post('api/frontend/v1/notiz/notizAnrechnung/loadDokumente/', {
-			notiz_id
-		});
-	},
-	deleteNotiz(notiz_id, type_id, id){
-		return this.$fhcApi.post('api/frontend/v1/notiz/notizAnrechnung/deleteNotiz/', {
-			notiz_id,
-			type_id,
-			id
-		});
-	},
-	updateNotiz(notiz_id, formData){
-		return this.$fhcApi.post('api/frontend/v1/notiz/notizAnrechnung/updateNotiz/' + notiz_id,
-			formData
-		);
-	},
-	getMitarbeiter(event){
-		return this.$fhcApi.get('api/frontend/v1/notiz/notizAnrechnung/getMitarbeiter/' + event);
-	}
-}

public/js/api/notiz/bestellung.js

@@ -1,38 +0,0 @@
-export default {
-	getNotizen(url, config, params){
-		return this.$fhcApi.get('api/frontend/v1/notiz/notizBestellung/getNotizen/' + params.id + '/' + params.type);
-	},
-	getUid(){
-		return this.$fhcApi.get('api/frontend/v1/notiz/notizBestellung/getUid/');
-	},
-	addNewNotiz(id, formData) {
-		return this.$fhcApi.post('api/frontend/v1/notiz/notizBestellung/addNewNotiz/' + id,
-			formData
-		);
-	},
-	loadNotiz(notiz_id){
-		return this.$fhcApi.post('api/frontend/v1/notiz/notizBestellung/loadNotiz/', {
-			notiz_id
-		});
-	},
-	loadDokumente(notiz_id){
-		return this.$fhcApi.post('api/frontend/v1/notiz/notizBestellung/loadDokumente/', {
-			notiz_id
-		});
-	},
-	deleteNotiz(notiz_id, type_id, id){
-		return this.$fhcApi.post('api/frontend/v1/notiz/notizBestellung/deleteNotiz/', {
-			notiz_id,
-			type_id,
-			id
-		});
-	},
-	updateNotiz(notiz_id, formData){
-		return this.$fhcApi.post('api/frontend/v1/notiz/notizBestellung/updateNotiz/' + notiz_id,
-			formData
-		);
-	},
-	getMitarbeiter(event){
-		return this.$fhcApi.get('api/frontend/v1/notiz/notizBestellung/getMitarbeiter/' + event);
-	}
-}

public/js/api/notiz/lehreinheit.js

@@ -1,38 +0,0 @@
-export default {
-	getNotizen(url, config, params){
-		return this.$fhcApi.get('api/frontend/v1/notiz/notizLehreinheit/getNotizen/' + params.id + '/' + params.type);
-	},
-	getUid(){
-		return this.$fhcApi.get('api/frontend/v1/notiz/notizLehreinheit/getUid/');
-	},
-	addNewNotiz(id, formData) {
-		return this.$fhcApi.post('api/frontend/v1/notiz/notizLehreinheit/addNewNotiz/' + id,
-			formData
-		);
-	},
-	loadNotiz(notiz_id){
-		return this.$fhcApi.post('api/frontend/v1/notiz/notizLehreinheit/loadNotiz/', {
-			notiz_id
-		});
-	},
-	loadDokumente(notiz_id){
-		return this.$fhcApi.post('api/frontend/v1/notiz/notizLehreinheit/loadDokumente/', {
-			notiz_id
-		});
-	},
-	deleteNotiz(notiz_id, type_id, id){
-		return this.$fhcApi.post('api/frontend/v1/notiz/notizLehreinheit/deleteNotiz/', {
-			notiz_id,
-			type_id,
-			id
-		});
-	},
-	updateNotiz(notiz_id, formData){
-		return this.$fhcApi.post('api/frontend/v1/notiz/notizLehreinheit/updateNotiz/' + notiz_id,
-			formData
-		);
-	},
-	getMitarbeiter(event){
-		return this.$fhcApi.get('api/frontend/v1/notiz/notizLehreinheit/getMitarbeiter/' + event);
-	}
-}

public/js/api/notiz/mitarbeiter.js

@@ -1,38 +0,0 @@
-export default {
-	getNotizen(url, config, params){
-		return this.$fhcApi.get('api/frontend/v1/notiz/notizMitarbeiter/getNotizen/' + params.id + '/' + params.type);
-	},
-	getUid(){
-		return this.$fhcApi.get('api/frontend/v1/notiz/notizMitarbeiter/getUid/');
-	},
-	addNewNotiz(id, formData) {
-		return this.$fhcApi.post('api/frontend/v1/notiz/notizMitarbeiter/addNewNotiz/' + id,
-			formData
-		);
-	},
-	loadNotiz(notiz_id){
-		return this.$fhcApi.post('api/frontend/v1/notiz/notizMitarbeiter/loadNotiz/', {
-			notiz_id
-		});
-	},
-	loadDokumente(notiz_id){
-		return this.$fhcApi.post('api/frontend/v1/notiz/notizMitarbeiter/loadDokumente/', {
-			notiz_id
-		});
-	},
-	deleteNotiz(notiz_id, type_id, id){
-		return this.$fhcApi.post('api/frontend/v1/notiz/notizMitarbeiter/deleteNotiz/', {
-			notiz_id,
-			type_id,
-			id
-		});
-	},
-	updateNotiz(notiz_id, formData){
-		return this.$fhcApi.post('api/frontend/v1/notiz/notizMitarbeiter/updateNotiz/' + notiz_id,
-			formData
-		);
-	},
-	getMitarbeiter(event){
-		return this.$fhcApi.get('api/frontend/v1/notiz/notizMitarbeiter/getMitarbeiter/' + event);
-	}
-}

public/js/api/notiz/person.js

@@ -38,4 +38,4 @@ export default {
 	isBerechtigt(id, type_id){
 		return this.$fhcApi.get('api/frontend/v1/notiz/notizPerson/isBerechtigt/');
 	}
-}
+}

public/js/api/notiz/prestudent.js

@@ -1,38 +0,0 @@
-export default {
-	getNotizen(url, config, params){
-		return this.$fhcApi.get('api/frontend/v1/notiz/notizPrestudent/getNotizen/' + params.id + '/' + params.type);
-	},
-	getUid(){
-		return this.$fhcApi.get('api/frontend/v1/notiz/notizPrestudent/getUid/');
-	},
-	addNewNotiz(id, formData) {
-		return this.$fhcApi.post('api/frontend/v1/notiz/notizPrestudent/addNewNotiz/' + id,
-			formData
-		);
-	},
-	loadNotiz(notiz_id){
-		return this.$fhcApi.post('api/frontend/v1/notiz/notizPrestudent/loadNotiz/', {
-			notiz_id
-		});
-	},
-	loadDokumente(notiz_id){
-		return this.$fhcApi.post('api/frontend/v1/notiz/notizPrestudent/loadDokumente/', {
-			notiz_id
-		});
-	},
-	deleteNotiz(notiz_id, type_id, id){
-		return this.$fhcApi.post('api/frontend/v1/notiz/notizPrestudent/deleteNotiz/', {
-			notiz_id,
-			type_id,
-			id
-		});
-	},
-	updateNotiz(notiz_id, formData){
-		return this.$fhcApi.post('api/frontend/v1/notiz/notizPrestudent/updateNotiz/' + notiz_id,
-			formData
-		);
-	},
-	getMitarbeiter(event){
-		return this.$fhcApi.get('api/frontend/v1/notiz/notizPrestudent/getMitarbeiter/' + event);
-	}
-}

public/js/api/notiz/projekt.js

@@ -1,38 +0,0 @@
-export default {
-	getNotizen(url, config, params){
-		return this.$fhcApi.get('api/frontend/v1/notiz/NotizProjekt/getNotizen/' + params.id + '/' + params.type);
-	},
-	getUid(){
-		return this.$fhcApi.get('api/frontend/v1/notiz/NotizProjekt/getUid/');
-	},
-	addNewNotiz(id, formData) {
-		return this.$fhcApi.post('api/frontend/v1/notiz/NotizProjekt/addNewNotiz/' + id,
-			formData
-		);
-	},
-	loadNotiz(notiz_id){
-		return this.$fhcApi.post('api/frontend/v1/notiz/NotizProjekt/loadNotiz/', {
-			notiz_id
-		});
-	},
-	loadDokumente(notiz_id){
-		return this.$fhcApi.post('api/frontend/v1/notiz/NotizProjekt/loadDokumente/', {
-			notiz_id
-		});
-	},
-	deleteNotiz(notiz_id, type_id, id){
-		return this.$fhcApi.post('api/frontend/v1/notiz/NotizProjekt/deleteNotiz/', {
-			notiz_id,
-			type_id,
-			id
-		});
-	},
-	updateNotiz(notiz_id, formData){
-		return this.$fhcApi.post('api/frontend/v1/notiz/NotizProjekt/updateNotiz/' + notiz_id,
-			formData
-		);
-	},
-	getMitarbeiter(event){
-		return this.$fhcApi.get('api/frontend/v1/notiz/NotizProjekt/getMitarbeiter/' + event);
-	}
-}

public/js/api/notiz/projektphase.js

@@ -1,38 +0,0 @@
-export default {
-	getNotizen(url, config, params){
-		return this.$fhcApi.get('api/frontend/v1/notiz/notizProjektphase/getNotizen/' + params.id + '/' + params.type);
-	},
-	getUid(){
-		return this.$fhcApi.get('api/frontend/v1/notiz/notizProjektphase/getUid/');
-	},
-	addNewNotiz(id, formData) {
-		return this.$fhcApi.post('api/frontend/v1/notiz/notizProjektphase/addNewNotiz/' + id,
-			formData
-		);
-	},
-	loadNotiz(notiz_id){
-		return this.$fhcApi.post('api/frontend/v1/notiz/notizProjektphase/loadNotiz/', {
-			notiz_id
-		});
-	},
-	loadDokumente(notiz_id){
-		return this.$fhcApi.post('api/frontend/v1/notiz/notizProjektphase/loadDokumente/', {
-			notiz_id
-		});
-	},
-	deleteNotiz(notiz_id, type_id, id){
-		return this.$fhcApi.post('api/frontend/v1/notiz/notizProjektphase/deleteNotiz/', {
-			notiz_id,
-			type_id,
-			id
-		});
-	},
-	updateNotiz(notiz_id, formData){
-		return this.$fhcApi.post('api/frontend/v1/notiz/notizProjektphase/updateNotiz/' + notiz_id,
-			formData
-		);
-	},
-	getMitarbeiter(event){
-		return this.$fhcApi.get('api/frontend/v1/notiz/notizProjektphase/getMitarbeiter/' + event);
-	}
-}

public/js/api/notiz/projekttask.js

@@ -1,38 +0,0 @@
-export default {
-	getNotizen(url, config, params){
-		return this.$fhcApi.get('api/frontend/v1/notiz/notizProjekttask/getNotizen/' + params.id + '/' + params.type);
-	},
-	getUid(){
-		return this.$fhcApi.get('api/frontend/v1/notiz/notizProjekttask/getUid/');
-	},
-	addNewNotiz(id, formData) {
-		return this.$fhcApi.post('api/frontend/v1/notiz/notizProjekttask/addNewNotiz/' + id,
-			formData
-		);
-	},
-	loadNotiz(notiz_id){
-		return this.$fhcApi.post('api/frontend/v1/notiz/notizProjekttask/loadNotiz/', {
-			notiz_id
-		});
-	},
-	loadDokumente(notiz_id){
-		return this.$fhcApi.post('api/frontend/v1/notiz/notizProjekttask/loadDokumente/', {
-			notiz_id
-		});
-	},
-	deleteNotiz(notiz_id, type_id, id){
-		return this.$fhcApi.post('api/frontend/v1/notiz/notizProjekttask/deleteNotiz/', {
-			notiz_id,
-			type_id,
-			id
-		});
-	},
-	updateNotiz(notiz_id, formData){
-		return this.$fhcApi.post('api/frontend/v1/notiz/notizProjekttask/updateNotiz/' + notiz_id,
-			formData
-		);
-	},
-	getMitarbeiter(event){
-		return this.$fhcApi.get('api/frontend/v1/notiz/notizProjekttask/getMitarbeiter/' + event);
-	}
-}

public/js/api/vertraege.js

@@ -1,8 +0,0 @@
-import person from "./vertraege/person.js";
-
-export default {
-	person,
-	configPrintDocument() {
-		return this.$fhcApi.get('api/frontend/v1/vertraege/config/printDocument');
-	}
-}

public/js/api/vertraege/person.js

@@ -1,69 +0,0 @@
-export default {
-	getAllVertraege(url, config, params){
-		return this.$fhcApi.get('api/frontend/v1/vertraege/vertraege/getAllVertraege/' + params.person_id);
-	},
-	getAllContractsNotAssigned(url, config, params){
-		return this.$fhcApi.get('api/frontend/v1/vertraege/vertraege/getAllContractsNotAssigned/' + params.person_id);
-	},
-	getAllContractsAssigned(url, config, params){
-		return this.$fhcApi.get('api/frontend/v1/vertraege/vertraege/getAllContractsAssigned/' + params.person_id + '/' + params.vertrag_id);
-	},
-	getAllContractsNotAssigned2(person_id){
-		return this.$fhcApi.get('api/frontend/v1/vertraege/vertraege/getAllContractsNotAssigned/' + person_id);
-	},
-	getStatiOfContract(url, config, params){
-		return this.$fhcApi.get('api/frontend/v1/vertraege/vertraege/getStatiOfContract/' + params.vertrag_id);
-	},
-	getAllContractTypes(){
-		return this.$fhcApi.get('api/frontend/v1/vertraege/vertraege/getAllContractTypes/');
-	},
-	getAllContractStati(){
-		return this.$fhcApi.get('api/frontend/v1/vertraege/vertraege/getAllContractStati/');
-	},
-	addNewContract(form, data) {
-		return this.$fhcApi.post(form,'api/frontend/v1/vertraege/vertraege/addNewContract/', data);
-	},
-	loadContract(vertrag_id){
-		return this.$fhcApi.post('api/frontend/v1/vertraege/vertraege/loadContract/' + vertrag_id);
-	},
-	updateContract(form, data) {
-		return this.$fhcApi.post(form,'api/frontend/v1/vertraege/vertraege/updateContract/', data);
-	},
-	deleteContract(vertrag_id){
-		return this.$fhcApi.post('api/frontend/v1/vertraege/vertraege/deleteContract/' + vertrag_id);
-	},
-	loadContractStatus(params){
-		return this.$fhcApi.post('api/frontend/v1/vertraege/vertraege/loadContractStatus/' + params.vertrag_id, params);
-	},
-	insertContractStatus(form, params) {
-		return this.$fhcApi.post(form,'api/frontend/v1/vertraege/vertraege/insertContractStatus/' + params.vertrag_id, params);
-	},
-	updateContractStatus(form, params) {
-		return this.$fhcApi.post(form,'api/frontend/v1/vertraege/vertraege/updateContractStatus/' + params.vertrag_id, params);
-	},
-	deleteContractStatus(params) {
-		return this.$fhcApi.post('api/frontend/v1/vertraege/vertraege/deleteContractStatus/' + params.vertrag_id, params);
-	},
-	deleteLehrauftrag(params) {
-		return this.$fhcApi.post('api/frontend/v1/vertraege/vertraege/deleteLehrauftrag/' + params.vertrag_id, params);
-	},
-	deleteBetreuung(params) {
-		return this.$fhcApi.post('api/frontend/v1/vertraege/vertraege/deleteBetreuung/' + params.vertrag_id, params);
-	},
-	getMitarbeiter(params){
-		return this.$fhcApi.post('api/frontend/v1/vertraege/vertraege/getMitarbeiter/');
-	},
-	getHeader(person_id){
-		return this.$fhcApi.post('api/frontend/v1/vertraege/vertraege/getHeader/' + person_id);
-	},
-	getPersonAbteilung(person_id){
-		return this.$fhcApi.post('api/frontend/v1/vertraege/vertraege/getPersonAbteilung/' + person_id);
-	},
-	getLeitungOrg(oekurzbz){
-		return this.$fhcApi.post('api/frontend/v1/vertraege/vertraege/getLeitungOrg/' + oekurzbz);
-	},
-	getMitarbeiterUid(person_id){
-		return this.$fhcApi.get('api/frontend/v1/vertraege/vertraege/getMitarbeiterUid/' + person_id);
-	},
-
-}

public/js/apps/Bismeldestichtag/Bismeldestichtag.js

@@ -237,6 +237,4 @@ const bismeldestichtagApp = Vue.createApp({
 	}
 });
 
-FhcApps.makeExtendable(bismeldestichtagApp);
-
 bismeldestichtagApp.use(PluginsPhrasen).mount('#main');

public/js/apps/Cis.js

@@ -142,9 +142,6 @@ const app = Vue.createApp({
         }
     }
 });
-
-FhcApps.makeExtendable(app);
-
 app.use(primevue.config.default, {
 	zIndex: {
 		overlay: 9000,

public/js/apps/Cis/Documents.js

@@ -87,8 +87,6 @@ const app = Vue.createApp({
 	}
 });
 
-FhcApps.makeExtendable(app);
-
 setScrollbarWidth();
 
 app.use(PluginsPhrasen);

public/js/apps/Cis/ProfilUpdateRequests.js

@@ -34,7 +34,4 @@ const app = Vue.createApp({
       });
   },
 });
-
-FhcApps.makeExtendable(app);
-
 app.use(PluginsPhrasen).mount("#content");

public/js/apps/Dashboard/Fhc.js

@@ -334,10 +334,6 @@ const app = Vue.createApp({
 // kind of a bandaid for bad css on some pages to avoid horizontal scroll
 setScrollbarWidth();
 app.config.globalProperties.$capitalize = capitalize;
-
-FhcApps.router.makeExtendable(router);
-FhcApps.makeExtendable(app);
-
 app.use(router);
 app.use(primevue.config.default, {
 	zIndex: {

public/js/apps/LVVerwaltung.js

@@ -89,12 +89,8 @@ const router = VueRouter.createRouter({
 	]
 });
 
-FhcApps.router.makeExtendable(router);
-
 const app = Vue.createApp();
 
-FhcApps.makeExtendable(app);
-
 app
 	.use(router)
 	.use(primevue.config.default, {

public/js/apps/LogsViewer/LogsViewer.js

@@ -42,7 +42,5 @@ const logsViewerApp = Vue.createApp({
 	}
 });
 
-FhcApps.makeExtendable(logsViewerApp);
-
 logsViewerApp.use(PluginsPhrasen).mount('#main');
 

public/js/apps/Studentenverwaltung.js

@@ -206,14 +206,10 @@ router.afterEach((to, from, failure) => {
 	document.title = title;
 });
 
-FhcApps.router.makeExtendable(router);
-
 const app = Vue.createApp({
 	name: 'StudentenverwaltungApp'
 });
 
-FhcApps.makeExtendable(app);
-
 app
 	.use(router)
 	.use(primevue.config.default, {

public/js/apps/Vertragsverwaltung.js

@@ -1,25 +0,0 @@
-import Vertragsverwaltung from "../components/Vertraege/Vertragsverwaltung.js";
-import Phrasen from "../plugins/Phrasen.js";
-
-const ciPath = FHC_JS_DATA_STORAGE_OBJECT.app_root.replace(/(https:|)(^|\/\/)(.*?\/)/g, '') + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
-
-const router = VueRouter.createRouter({
-	history: VueRouter.createWebHistory(),
-	routes: [
-		{ path: `/${ciPath}/vertragsverwaltung`, component: Vertragsverwaltung },
-	]
-});
-
-const app = Vue.createApp({
-	name: 'VertragsverwaltungApp'
-});
-
-app
-	.use(router)
-	.use(primevue.config.default, {
-		zIndex: {
-			overlay: 1100
-		}
-	})
-	.use(Phrasen)
-	.mount('#main');

public/js/apps/lehre/Antrag.js

@@ -20,9 +20,6 @@ const app = Vue.createApp({
 		};
 	}
 });
-
-FhcApps.makeExtendable(app);
-
 app
 	.use(PluginsPhrasen)
 	.mount('#wrapper');

public/js/apps/lehre/Antrag/Leitung.js

@@ -7,9 +7,6 @@ const app = Vue.createApp({
 		StudierendenantragLeitung
 	}
 });
-
-FhcApps.makeExtendable(app);
-
 app
 	.use(PluginsPhrasen)
 	.use(primevue.config.default,{zIndex: {overlay: 9999}})

public/js/apps/lehre/Antrag/Lvzuweisung.js

@@ -12,9 +12,6 @@ const app = Vue.createApp({
 		}
 	}
 });
-
-FhcApps.makeExtendable(app);
-
 app
 	.use(PluginsPhrasen)
 	.mount('#wrapper');

public/js/apps/lehre/Antrag/Student.js

@@ -7,9 +7,6 @@ const app = Vue.createApp({
 		LvPopup
 	}
 });
-
-FhcApps.makeExtendable(app);
-
 app
 	.use(PluginsPhrasen)
 	.mount('#wrapper');

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

@@ -28,8 +28,6 @@ const lvTemplatesApp = Vue.createApp({
 	}
 });
 
-FhcApps.makeExtendable(lvTemplatesApp);
-
 lvTemplatesApp
 	.use(primevue.config.default,{zIndex: {overlay: 9999}})
 	.use(PluginsPhrasen)

public/js/components/Betriebsmittel/Betriebsmittel.js

@@ -43,28 +43,12 @@ export default {
 	},
 	data() {
 		return {
-			listBetriebsmitteltyp: [],
-			formData: {
-				ausgegebenam : new Date(),
-				betriebsmitteltyp: 'Zutrittskarte'
-			},
-			statusNew: true,
-			filteredInventar: [],
-			layout: 'fitColumns',
-			layoutColumnsOnNewData: false,
-			height: '550',
-		}
-	},
-	computed: {
-		tabulatorOptions() {
-			const options = {
+			tabulatorOptions: {
 				ajaxURL: 'dummy',
 				ajaxRequestFunc: () => this.$api.call(
 					this.endpoint.getAllBetriebsmittel(this.typeId, this.id, (this.filterByProvidedTypes ? this.betriebsmittelTypes : null))
 				),
 				ajaxResponse: (url, params, response) => response.data,
-				persistenceID: 'core-betriebsmittel-20260217',
-				selectableRows: true,
 				columns: [
 					{title: "Nummer", field: "nummer", width: 150},
 					{title: "PersonId", field: "person_id", visible: false},
@@ -131,7 +115,7 @@ export default {
 										'/content/pdfExport.php?xml=betriebsmittelperson.rdf.php&xsl=Uebernahme&id=' + cellData.betriebsmittelperson_id + '&output=pdf';
 
 									window.open(linkToPdf, '_blank');
-								});
+							});
 							container.append(button);
 
 							button = document.createElement('button');
@@ -159,47 +143,64 @@ export default {
 							return container;
 						},
 						frozen: true
-					}
-				],
-			};
-			return options;
-		},
-		tabulatorEvents() {
-			const events = [
+					}],
+				layout: 'fitColumns',
+				layoutColumnsOnNewData: false,
+				height: '550',
+				persistenceID: 'core-betriebsmittel'
+			},
+			tabulatorEvents: [
 				{
 					event: 'tableBuilt',
 					handler: async() => {
 
 						await this.$p.loadCategory(['wawi', 'global', 'infocenter', 'betriebsmittel', 'person']);
 
-						const setHeader = (field, text) => {
-							const col = this.$refs.table.tabulator.getColumn(field);
-							if (!col) return;
+						let cm = this.$refs.table.tabulator.columnManager;
 
-							const el = col.getElement();
-							if (!el || !el.querySelector) return;
-
-							const titleEl = el.querySelector('.tabulator-col-title');
-							if (titleEl) {
-								titleEl.textContent = text;
-							}
-						};
-
-						setHeader('nummer', this.$p.t('wawi', 'nummer'));
-						setHeader('betriebsmitteltyp', this.$p.t('global', 'typ'));
-						setHeader('anmerkung', this.$p.t('global', 'anmerkung'));
-						setHeader('retouram', this.$p.t('wawi', 'retourdatum'));
-						setHeader('beschreibung', this.$p.t('global', 'beschreibung'));
-						setHeader('kaution', this.$p.t('infocenter', 'kaution'));
-						setHeader('ausgegebenam', this.$p.t('wawi', 'ausgabedatum'));
-						setHeader('betriebsmittel_id', this.$p.t('ui', 'betriebsmittel_id'));
-						setHeader('betriebsmittelperson_id', this.$p.t('ui', 'betriebsmittelperson_id'));
-						setHeader('person_id', this.$p.t('person', 'person_id'));
-						setHeader('uid', this.$p.t('person', 'uid'));
+						cm.getColumnByField('nummer').component.updateDefinition({
+							title: this.$p.t('wawi', 'nummer')
+						});
+						cm.getColumnByField('betriebsmitteltyp').component.updateDefinition({
+							title: this.$p.t('global', 'typ')
+						});
+						cm.getColumnByField('anmerkung').component.updateDefinition({
+							title: this.$p.t('global', 'anmerkung')
+						});
+						cm.getColumnByField('retouram').component.updateDefinition({
+							title: this.$p.t('wawi', 'retourdatum')
+						});
+						cm.getColumnByField('beschreibung').component.updateDefinition({
+							title: this.$p.t('global', 'beschreibung')
+						});
+						cm.getColumnByField('kaution').component.updateDefinition({
+							title: this.$p.t('infocenter', 'kaution')
+						});
+						cm.getColumnByField('ausgegebenam').component.updateDefinition({
+							title: this.$p.t('wawi', 'ausgabedatum')
+						});
+						cm.getColumnByField('betriebsmittel_id').component.updateDefinition({
+							title: this.$p.t('ui', 'betriebsmittel_id')
+						});
+						cm.getColumnByField('betriebsmittelperson_id').component.updateDefinition({
+							title: this.$p.t('ui', 'betriebsmittelperson_id')
+						});
+						cm.getColumnByField('person_id').component.updateDefinition({
+							title: this.$p.t('person', 'person_id')
+						});
+						cm.getColumnByField('uid').component.updateDefinition({
+							title: this.$p.t('person', 'uid')
+						});
 					}
 				}
-			];
-			return events;
+			],
+			listBetriebsmitteltyp: [],
+			formData: {
+				ausgegebenam : new Date(),
+				betriebsmitteltyp: 'Zutrittskarte'
+			},
+			statusNew: true,
+			filteredInventar: []
 		}
 	},
 	watch: {
@@ -465,4 +466,5 @@ export default {
 			</template>
 		</bs-modal>
 	</div>`
-}
+}
+

public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js

@@ -180,7 +180,7 @@ export const AbgabetoolAssistenz = {
 					// 	frozen: true,
 					// 	width: 40
 					// },
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4details'))), field: 'details', headerFilter: false, headerSort: false, formatter: this.formAction, tooltip:false, minWidth: 100, cssClass: 'sticky-col'},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4details'))), field: 'details', headerFilter: false, headerSort: false, formatter: this.formAction, tooltip:false, minWidth: 150, cssClass: 'sticky-col'},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4personenkennzeichen'))), headerFilter: true, field: 'pkz', formatter: this.pkzTextFormatter, widthGrow: 1, tooltip: false},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4vorname'))), field: 'student_vorname', headerFilter: true, formatter: this.centeredTextFormatter,widthGrow: 1},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4nachname'))), field: 'student_nachname', headerFilter: true, formatter: this.centeredTextFormatter, widthGrow: 1},
@@ -226,7 +226,7 @@ export const AbgabetoolAssistenz = {
 						field: 'qgate2Status', formatter: this.centeredTextFormatter, widthGrow: 1, width: 220, tooltip: false},
 				],
 				persistence: false,
-				persistenceID: "abgabetool_2026_03_16"
+				persistenceID: "abgabetool_2026_02_26"
 			},
 			abgabeTableEventHandlers: [
 			{
@@ -645,7 +645,7 @@ export const AbgabetoolAssistenz = {
 			actionButtons.className = "d-flex gap-3"; // you can keep Bootstrap gap if loaded
 			actionButtons.style.display = "flex";
 			actionButtons.style.alignItems = "stretch"; // buttons stretch to full height
-			actionButtons.style.justifyContent = "start";
+			actionButtons.style.justifyContent = "center";
 			actionButtons.style.height = "100%"; // full grid cell height
 
 			const val = cell.getValue();
@@ -675,20 +675,8 @@ export const AbgabetoolAssistenz = {
 				createButton('fa fa-timeline', 'abgabetool/c4termineTimeLine', () => this.openTimeline(val))
 			);
 
-			if(val.latestTerminWithUpload) {
-				actionButtons.append(
-					createButton('fa fa-download', 'abgabetool/c4downloadLatestAbgabe', () => this.downloadAbgabe(val.latestTerminWithUpload.paabgabe_id, val.student_uid, val.projektarbeit_id))
-				)
-			}
-
 			return actionButtons;
 		},
-		downloadAbgabe(paabgabe_id, student_uid, projektarbeit_id) {
-			const url = `/api/frontend/v1/Abgabe/getStudentProjektarbeitAbgabeFile?paabgabe_id=${paabgabe_id}&student_uid=${student_uid}&projektarbeit_id=${projektarbeit_id}`;
-
-			window.open(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + url)
-			// this.$api.call(ApiAbgabe.getStudentProjektarbeitAbgabeFile(termin.paabgabe_id, this.projektarbeit.student_uid))
-		},
 
 		undoSelection(cell) {
 			// checks if cells row is selected and unselects -> imitates columns which dont trigger row selection
@@ -792,8 +780,6 @@ export const AbgabetoolAssistenz = {
 					// TODO: mehrsprachig englisch
 					projekt.note_bez = opt.bezeichnung
 				}
-
-				const latestTerminWithUpload = this.findLatestTerminWithUpload(projekt)
 				
 				return {
 					...projekt,
@@ -801,7 +787,6 @@ export const AbgabetoolAssistenz = {
 					details: {
 						student_uid: projekt.student_uid,
 						projektarbeit_id: projekt.projektarbeit_id,
-						latestTerminWithUpload: latestTerminWithUpload ?? null
 					},
 					pkz: this.buildPKZ(projekt),
 					beurteilung: projekt.beurteilungLink ?? null,
@@ -815,15 +800,6 @@ export const AbgabetoolAssistenz = {
 				}
 			})
 		},
-		findLatestTerminWithUpload(projekt) {
-			const withAbgabedatumSorted = projekt?.abgabetermine?.filter(t => t.abgabedatum != null)?.sort((a,b) => a < b)
-
-			if(withAbgabedatumSorted.length) {
-				return withAbgabedatumSorted[0]
-			}
-
-			return null
-		},
 		createInfoString(data) {
 			let str = '';
 
@@ -1437,11 +1413,8 @@ export const AbgabetoolAssistenz = {
 		
 		<div id="abgabetable" style="max-height:40vw;">
 			<div class="row">
-				<div class="col-auto me-auto">
-					<h2 tabindex="1">{{$p.t('abgabetool/abgabetoolTitle')}}</h2>
-				</div>
 				<div class="col-auto">
-					<label class="col-form-label">{{$capitalize($p.t('lehre/studiengang'))}}:</label>
+					<h2 tabindex="1">{{$p.t('abgabetool/abgabetoolTitle')}}</h2>
 				</div>
 				<div class="col-3">
 					<Dropdown
@@ -1457,9 +1430,6 @@ export const AbgabetoolAssistenz = {
 						</template>
 					</Dropdown>
 				</div>
-				<div class="col-auto">
-					<label class="col-form-label">{{$capitalize($p.t('lehre/note'))}}:</label>
-				</div>
 				<div class="col-3">
 					<Dropdown
 						:placeholder="$p.t('lehre/note')" 

public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js

@@ -667,10 +667,8 @@ export const AbgabetoolMitarbeiter = {
 		setDetailComponent(details){
 			this.loading=true
 
-			const projektarbeiten = this.projektarbeiten?.retval ?? this.projektarbeiten
+			const pa = this.projektarbeiten?.retval?.find(projekarbeit => projekarbeit.projektarbeit_id == details.projektarbeit_id)
 
-			const pa = projektarbeiten.find(projekarbeit => projekarbeit.projektarbeit_id == details.projektarbeit_id)
-			
 			let paIsBenotet = false
 			if(pa.note !== undefined && pa.note !== null) {
 				// check if the note is not defined as a non final projektarbeit note

public/js/components/Cis/Mylv/LvUebersicht.js

@@ -2,7 +2,6 @@ import BsModal from "../../Bootstrap/Modal.js";
 import LvMenu from "./LvMenu.js";
 
 import ApiAddons from '../../../api/factory/addons.js';
-import ApiCisStudium from '../../../api/factory/cis/studium.js';
 
 export default  {
   
@@ -64,8 +63,7 @@ export default  {
 
 			// check lv evaluierung info
 			if (this.studium_studiensemester) {
-				this.$api
-					.call(ApiCisStudium.getLvEvaluierungInfo(this.studium_studiensemester, this.event.lehreinheit_id ?? this.event.lehrveranstaltung_id))
+				this.$fhcApi.factory.studium.getLvEvaluierungInfo(this.studium_studiensemester, this.event.lehreinheit_id ?? this.event.lehrveranstaltung_id)
 					.then(data => data.data)
 					.then(res => {
 						this.lvEvaluierungMessage = res.message;
@@ -74,8 +72,7 @@ export default  {
 
 			// check if the lv has lvplan entries for this studiensemester
 			if (this.studiensemester && this.event) {
-				return this.$api
-					.call(ApiCisStudium.getLvPlanForStudiensemester(this.studiensemester, this.event.lehreinheit_id ?? this.event.lehrveranstaltung_id))
+				return this.$fhcApi.factory.studium.getLvPlanForStudiensemester(this.studiensemester, this.event.lehreinheit_id ?? this.event.lehrveranstaltung_id)
 					.then(data => data.data)
 					.then(res => {
 						if (Array.isArray(res) && res.length > 0) {

public/js/components/Cis/Studium/Studium.js

@@ -1,5 +1,4 @@
 import LvUebersicht from "../Mylv/LvUebersicht.js";
-import ApiCisStudium from '../../../api/factory/cis/studium.js';
 
 
 export default {
@@ -98,32 +97,28 @@ export default {
 			return value;
 		},
 		changeSelectedStudienSemester(studiensemester_kurzbz) {
-			return this.$api
-				.call(ApiCisStudium.getAllStudienSemester(studiensemester_kurzbz, this.selectedStudiengang, this.selectedSemester, this.selectedStudienordnung))
+			this.$fhcApi.factory.studium.getAllStudienSemester(studiensemester_kurzbz, this.selectedStudiengang, this.selectedSemester, this.selectedStudienordnung)
 				.then(data => data.data)
 				.then(res => {
 					this.extractPropertyValues(res);
 				})
 		},
 		changeSelectedStudienGang(studiengang_kz) {
-			return this.$api
-				.call(ApiCisStudium.getAllStudienSemester(this.selectedStudiensemester, studiengang_kz,  this.selectedSemester, this.selectedStudienordnung))
+			this.$fhcApi.factory.studium.getAllStudienSemester(this.selectedStudiensemester, studiengang_kz, this.selectedSemester, this.selectedStudienordnung)
 				.then(data => data.data)
 				.then(res => {
 					this.extractPropertyValues(res);
 				})
 		},
 		changeSelectedSemester(semester) {
-			return this.$api
-				.call(ApiCisStudium.getAllStudienSemester(this.selectedStudiensemester, this.selectedStudiengang, semester, this.selectedStudienordnung))
+			this.$fhcApi.factory.studium.getAllStudienSemester(this.selectedStudiensemester, this.selectedStudiengang, semester, this.selectedStudienordnung)
 				.then(data => data.data)
 				.then(res => {
 					this.extractPropertyValues(res);
 				})
 		},
 		changeSelectedStudienPlan(studienplan_id) {
-			return this.$api
-				.call(ApiCisStudium.getAllStudienSemester(this.selectedStudiensemester, this.selectedStudiengang, this.selectedSemester, studienplan_id))
+			this.$fhcApi.factory.studium.getAllStudienSemester(this.selectedStudiensemester, this.selectedStudiengang, this.selectedSemester, studienplan_id)
 				.then(data => data.data)
 				.then(res => {
 					this.extractPropertyValues(res);
@@ -214,7 +209,7 @@ export default {
 				default:
 					return `${studiensemester}`;
 			}
-		},
+		}
 	},
 
 	computed:{
@@ -261,12 +256,12 @@ export default {
 		const studienordnung = JSON.parse(this.getDataFromLocalStorage("studienordnung")) ?? undefined;
 
 		// only fetch default data if no data is stored in the local storage
-		this.$api
-			.call(ApiCisStudium.getAllStudienSemester(studiensemester, studiengang, semester, studienordnung))
-			.then(data => data.data)
-			.then(res => {
-				this.extractPropertyValues(res);
-			})
+		
+		this.$fhcApi.factory.studium.getAllStudienSemester(studiensemester, studiengang, semester, studienordnung)
+		.then(data => data.data)
+		.then(res => {
+			this.extractPropertyValues(res);
+		})
 
 	},
 	template: `

public/js/components/DetailHeader/DetailHeader.js

@@ -1,11 +1,12 @@
 import ApiDetailHeader from "../../api/factory/detailHeader.js";
-import ApiHandleFoto from "../../api/factory/fotoHandling.js";
-import ModalUploadFoto from "./Modal/UploadFoto.js";
 
 export default {
 	name: 'DetailHeader',
-	components: {
-		ModalUploadFoto
+	inject: {
+		domain: {
+			from: 'configDomain',
+			default: 'technikum-wien.at'
+		},
 	},
 	props: {
 		headerData: {
@@ -16,19 +17,6 @@ export default {
 			type: Number,
 			required: false
 		},
-		mitarbeiter_uid: {
-			type: String,
-			required: false
-		},
-		fotoEditable: {
-			type: Boolean,
-			required: false,
-			default: false
-		},
-		domain: {
-			type: String,
-			required: false
-		},
 		typeHeader: {
 			type: String,
 			default: 'student',
@@ -48,40 +36,31 @@ export default {
 			if (this.typeHeader === 'student') return this.headerData;
 			if (this.typeHeader === 'mitarbeiter') return this.person_id;
 			return null;
-		},
-		hasTileAlphaSlot() {
-			return !!this.$slots.titleAlphaTile
-		},
-		hasTileBetaSlot() {
-			return !!this.$slots.titleBetaTile
-		},
-		hasTileGammaSlot() {
-			return !!this.$slots.titleGammaTile
-		},
-		hasTileUIDSlot() {
-			return !!this.$slots.uid
-		},
-
+		}
 	},
 	created(){
-		if (this.typeHeader === 'student') {
-			if (!this.headerData) {
-				throw new Error('[DetailHeader] "headerData" is required.')
-			}
-		} else if (this.typeHeader === 'mitarbeiter') {
-			if (!this.person_id || !this.mitarbeiter_uid || !this.domain) {
-				throw new Error(
-					'[DetailHeader] "person_id", "mitarbeiter_uid", and "domain" are requried.'
-				)
-			}
-			this.loadHeaderData(this.person_id, this.mitarbeiter_uid);
+		if(this.person_id) {
+			this.getHeader(this.person_id);
+
+			this.loadDepartmentData(this.mitarbeiter_uid)
+				.then(() => {
+					// Call getLeitungOrg only after departmentData is loaded
+					this.getLeitungOrg(this.departmentData.oe_kurzbz);
+				})
+				.catch((error) => {
+					console.error("Error loading department data:", error);
+				});
 		}
 	},
 	watch: {
 		person_id: {
 			handler(newVal) {
 				if (newVal) {
-					this.loadHeaderData(newVal, this.mitarbeiter_uid);
+					this.getHeader(this.person_id);
+					this.loadDepartmentData(this.person_id).
+					then(() => {
+						this.getLeitungOrg(this.departmentData.oe_kurzbz);
+					});
 				}
 			},
 			deep: true,
@@ -92,21 +71,9 @@ export default {
 			headerDataMa: {},
 			departmentData: {},
 			leitungData: {},
-			isFetchingIssues: false
 		};
 	},
 	methods: {
-		loadHeaderData(person_id, mitarbeiter_uid){
-			this.getHeader(person_id);
-			this.loadDepartmentData(mitarbeiter_uid)
-				.then(() => {
-					// Call getLeitungOrg only after departmentData is loaded
-					this.getLeitungOrg(this.departmentData.oe_kurzbz);
-				})
-				.catch((error) => {
-					console.error("Error loading header data: ", error);
-				});
-		},
 		getHeader(person_id) {
 			return this.$api
 				.call(ApiDetailHeader.getHeader(person_id))
@@ -132,46 +99,9 @@ export default {
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
-		async goToLeitung() {
-			this.loadHeaderData(this.leitungData.person_id, this.leitungData.uid);
-			this.redirectToLeitung();
-		},
-		redirectToLeitung() {
+		redirectToLeitung(){
 			this.$emit('redirectToLeitung', {
-				person_id: this.leitungData.person_id,
-				uid: this.leitungData.uid
-			});
-		},
-		showModal(person_id){
-			this.$refs.modalFoto.open(person_id);
-		},
-		showDeleteModal(person_id){
-			this.$fhcAlert
-				.confirmDelete()
-				.then(result => result
-					? person_id
-					: Promise.reject({handled: true}))
-				.then(this.deleteFoto)
-				.catch(this.$fhcAlert.handleSystemError);
-			},
-		deleteFoto(person_id){
-			return this.$api
-				.call(ApiHandleFoto.deleteFoto(person_id))
-				.then(result => {
-					this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
-				})
-				.catch(this.$fhcAlert.handleSystemError)
-				.finally(()=> {
-					this.reload();
-				});
-		},
-		reload() {
-			if(this.person_id) {
-				this.loadHeaderData(this.person_id, this.mitarbeiter_uid);
-			}
-			else {
-				this.$emit('reload');
-			}
+				person_id: this.leitungData.person_id});
 		},
 		getFotoSrc(foto) {
 			if(foto === null) {
@@ -182,127 +112,74 @@ export default {
 		}
 	},
 	template: `
-		<div class="core-header d-flex justify-content-start align-items-center w-100 overflow-auto pb-2 gap-3" style="max-height:9rem; min-width: 37.5rem;">
-
-			<modal-upload-foto
-				v-if="person_id"
-				ref="modalFoto"
-				:person_id="person_id"
-				@reload="reload"
-			>
-			</modal-upload-foto>
-			<modal-upload-foto
-				v-else
-				ref="modalFoto"
-				:person_id="headerData[0].person_id"
-				@reload="reload"
-			>
-			</modal-upload-foto>
+		<div class="core-header d-flex justify-content-start align-items-center w-100 overflow-auto pb-3 gap-3" style="max-height:9rem; min-width: 37.5rem;">
 
 			<template v-if="typeHeader==='student'">
+					<div
+						v-for="person in headerData"
+						:key="person.person_id"
+						class="d-flex flex-column align-items-center h-100 position-relative d-inline-block"
+					>
+						<img
+						  class="d-block rounded"
+						  style="height: 84px;"
+						  alt="Profilbild"
+						  :src="getFotoSrc(person.foto)"
+						/>
 
-				<div
-					v-for="person in headerData"
-					:key="person.person_id"
-					class="foto-container d-flex flex-column align-items-center h-100 position-relative d-inline-block"
-				>
-					<img
-					  class="d-block rounded"
-					  style="height: 75px;"
-					  alt="Profilbild"
-					  :src="getFotoSrc(person.foto)"
-					/>
-
-					<template v-if="person.foto_sperre">
-						<i class="fa fa-lock text-secondary bg-light rounded d-flex justify-content-center align-items-center position-absolute top-0 end-0"
-						style="z-index: 1; font-size: 1rem; width: 1.25rem; height: 1.25rem;"
-						>
-						</i>
-					</template>
-					<template v-if="fotoEditable">
-						<button
-							type="button"
-							class="fotoedit buttonleft btn btn-outline-dark btn-sm d-flex justify-content-center align-items-center position-absolute start-0"
-							@click="showDeleteModal(headerData[0].person_id)">
-							<i class="fa fa-xmark"></i>
-						</button>
-						<button
-							type="button"
-							class="fotoedit buttonright btn btn-outline-dark btn-sm d-flex justify-content-center align-items-center position-absolute end-0"
-							@click="showModal(headerData[0].person_id)">
-							<i class="fa fa-pen"></i>
-						</button>
-					</template>
+						<template v-if="person.foto_sperre">
+							<i
+							  class=" fa fa-lock text-secondary bg-light rounded d-flex justify-content-center align-items-center position-absolute top-0 end-0"
+							  style="z-index: 1; font-size: 1rem; width: 1.25rem; height: 1.25rem;"
+							></i>
+						</template>
 					<small class="text-muted">{{person.uid}}</small>
-				</div>
+					</div>
 
 					<div v-if="headerData.length == 1">
-						<div class="d-flex align-items-center gap-3">
-							<h2 class="h4">
-								{{headerData[0].titelpre}}
-								{{headerData[0].vorname}}
-								{{headerData[0].nachname}}
-								<span v-if="headerData[0].titelpost">, </span>
-								{{headerData[0].titelpost}}
-							</h2>
-							<h6  v-if="headerData[0].unruly" class="badge" :class="'bg-unruly rounded-0'"><strong>unruly</strong></h6>
-						</div>
+						<h2 class="h4">
+							{{headerData[0].titelpre}}
+							{{headerData[0].vorname}}
+							{{headerData[0].nachname}}<span v-if="headerData[0].titelpost">, </span>
+							{{headerData[0].titelpost}}
+						</h2>
 
-					<h5 class="h6">
-						<strong class="text-muted">{{$p.t('lehre', 'studiengang')}} </strong>
-						 {{headerData[0].stg_bezeichnung}} ({{headerData[0].studiengang}})
-						<strong v-if="headerData[0].semester" class="text-muted"> | {{$p.t('lehre', 'semester')}} </strong>
-						  {{headerData[0].semester}}
-						<strong v-if="headerData[0].verband" class="text-muted"> | {{$p.t('lehre', 'verband')}}</strong>
-						{{headerData[0].verband}}
-						<strong v-if="headerData[0].gruppe" class="text-muted"> | {{$p.t('lehre', 'gruppe')}} </strong>
-						{{headerData[0].gruppe}}
-					</h5>
+						<h5 class="h6">
+						 <strong class="text-muted">Person ID </strong>
+							{{headerData[0].person_id}}
+							<strong class="text-muted">| {{$p.t('lehre', 'studiengang')}} </strong>
+							 {{headerData[0].stg_bezeichnung}} ({{headerData[0].studiengang}})
+							<strong v-if="headerData[0].semester" class="text-muted"> | {{$p.t('lehre', 'semester')}} </strong>
+							  {{headerData[0].semester}}
+							<strong v-if="headerData[0].verband" class="text-muted"> | {{$p.t('lehre', 'verband')}}</strong>
+							{{headerData[0].verband}}
+							<strong v-if="headerData[0].gruppe" class="text-muted"> | {{$p.t('lehre', 'gruppe')}} </strong>
+							{{headerData[0].gruppe}}
+						 </h5>
 
-					<h5 class="h6">
+					  <h5 class="h6">
 						<strong class="text-muted">Email </strong>
 						<span>
 							<a :href="'mailto:'+headerData[0]?.mail_intern">{{headerData[0].mail_intern}}</a>
 						</span>
 						<strong v-if="headerData[0].statusofsemester" class="text-muted"> | Status </strong>
 						 {{headerData[0].statusofsemester}}
+						<strong class="text-muted"> | {{$p.t('person', 'matrikelnummer')}} </strong>
+						  {{headerData[0].matr_nr}}
 					  </h5>
 
-				</div>
-				<div v-if="headerData.length == 1" class="col-md-1 d-flex flex-column align-items-end justify-content-start ms-auto">
-					<div class="d-flex py-1">
-						<div class="px-2" style="min-width: 100px;">
-							<slot name="issues"></slot>
-						</div>
-						<div v-if="hasTileGammaSlot" class="px-2" style="border-left: 1px solid #EEE">
-							<h4 class="mb-1 text-center"><slot name="titleGammaTile"></slot></h4>
-							<h6 class="text-muted text-center"><slot name="valueGammaTile"></slot></h6>
-						</div>
-						<div v-if="hasTileBetaSlot" class="px-2" style="border-left: 1px solid #EEE">
-							<h4 class="mb-1 text-center"><slot name="titleBetaTile"></slot></h4>
-							<h6 class="text-muted text-center"><slot name="valueBetaTile"></slot></h6>
-						</div>
-						<div v-if="hasTileAlphaSlot" class="px-2" style="border-left: 1px solid #EEE">
-							<h4 class="mb-1 text-center"><slot name="titleAlphaTile"></slot></h4>
-							<h6 class="text-muted text-center"><slot name="valueAlphaTile"></slot></h6>
-						</div>
-						<div v-if="hasTileUIDSlot" class="px-2" style="border-left: 1px solid #EEE">
-							<h4 class="mb-1 text-center">UID</h4>
-							<h6 class="text-muted text-center"><slot name="uid"></slot></h6>
-						</div>
 					</div>
-				</div>
-
 		</template>
 
 		<template v-if="typeHeader==='mitarbeiter'">
-
-				<div class="foto-container col-md-2 d-flex justify-content-start align-items-center w-30 pb-3 gap-3 mt-3 position-relative" style="max-height: 8rem; max-width: 6rem; overflow: hidden;">
+			<div class="row">
+				<div class="col-md-2 d-flex justify-content-start align-items-center w-30 pb-3 gap-3 position-relative"
+						style="max-height: 8rem; max-width: 6rem; overflow: hidden;">
 					<img
-					  class="d-block w-100 h-100 rounded"
-					  style="height: 84px; object-fit: contain;"
+					  class="d-block rounded"
+					  style="height: 84px;"
 					  alt="Profilbild"
-					  :src="getFotoSrc(headerDataMa.foto)"
+					  :src="'data:image/jpeg;base64,' + headerDataMa.foto"
 					/>
 					<template v-if="headerDataMa.foto_sperre">
 						<i
@@ -310,73 +187,31 @@ export default {
 						  style="z-index: 1; font-size: 1rem; width: 1.25rem; height: 1.25rem;"
 						></i>
 					</template>
-					<template v-if="fotoEditable">
-						<button
-							type="button"
-							class="fotoedit btn btn-outline-dark btn-sm d-flex justify-content-center align-items-center position-absolute start-0"
-							style="z-index: 104; font-size: 1rem; width: 2.5rem; height: 2.5rem; opacity:0; transition: opacity 0.2s; top:13%;"
-							@click="showDeleteModal(person_id)">
-							<i class="fa fa-xmark"></i>
-						</button>
-						<button
-							type="button"
-							class="fotoedit btn btn-outline-dark btn-sm d-flex justify-content-center align-items-center position-absolute end-0"
-							style="z-index: 104; font-size: 1rem; width: 2.5rem; height: 2.5rem; opacity:0; transition: opacity 0.2s; top:13%;"
-							@click="showModal(person_id)">
-							<i class="fa fa-pen"></i>
-						</button>
-					</template>
 				</div>
 
 				<!--show Ma-Details-->
-				<div class="col-md-9 text-nowrap mt-2">
-					<h4>{{headerDataMa.titelpre}} {{headerDataMa.vorname}} {{headerDataMa.nachname}}<span v-if="headerDataMa?.titelpost">, </span> {{headerDataMa.titelpost}}</h4>
+				<div class="col-md-10">
+					<h5>{{headerDataMa.titelpre}} {{headerDataMa.vorname}} {{headerDataMa.nachname}}<span v-if="headerDataMa?.titelpost">, </span> {{headerDataMa.titelpost}}
+					</h5>
 					<strong class="text-muted">{{departmentData.organisationseinheittyp_kurzbz}}</strong>
 						{{departmentData.bezeichnung}}
 					<span v-if="leitungData.uid"> | </span>
 					<strong v-if="leitungData.uid" class="text-muted">Vorgesetzte*r </strong>
-					<a href="#" @click.prevent="goToLeitung">
+					<a href="#" @click.prevent="redirectToLeitung">
 						{{leitungData.titelpre}} {{leitungData.vorname}} {{leitungData.nachname}}
 					</a>
 					<p>
 						<strong class="text-muted">Email </strong>
-						 <span v-if="headerDataMa && (headerDataMa.alias === undefined || headerDataMa.alias === null || headerDataMa.alias === '')">
-							<a :href="'mailto:' + mitarbeiter_uid + '@' + domain">
-							  {{ mitarbeiter_uid }}@{{ domain }}
-							</a>
+						 <span v-if="!headerDataMa?.alias">
+							<a :href="'mailto:'+headerDataMa?.uid+'@'+domain">{{headerDataMa.uid}}@{{domain}}</a>
 						</span>
-						<span v-else>
+						<span v-if="headerDataMa?.alias">
 							<a :href="'mailto:'+headerDataMa?.alias+'@'+domain">{{headerDataMa.alias}}@{{domain}}</a>
 						</span>
 						<span v-if="headerDataMa?.telefonklappe" class="mb-2"> | <strong class="text-muted">DW </strong>{{headerDataMa?.telefonklappe}}</span>
 					</p>
-					<slot name="tag"></slot>
 				</div>
-
-				<div class="col-md-1 d-flex flex-column align-items-end justify-content-start ms-auto">
-					<div class="d-flex py-1">
-						<div class="px-2" style="min-width: 100px;">
-							<slot name="issues"></slot>
-						</div>
-						<div v-if="hasTileGammaSlot" class="px-2" style="border-left: 1px solid #EEE">
-							<h4 class="mb-1 text-center"><slot name="titleGammaTile"></slot></h4>
-							<h6 class="text-muted text-center"><slot name="valueGammaTile"></slot></h6>
-						</div>
-						<div v-if="hasTileBetaSlot" class="px-2" style="border-left: 1px solid #EEE">
-							<h4 class="mb-1 text-center"><slot name="titleBetaTile"></slot></h4>
-							<h6 class="text-muted text-center"><slot name="valueBetaTile" :valueBetaTile="valueBetaTile"></slot></h6>
-						</div>
-						<div v-if="hasTileAlphaSlot" class="px-2" style="border-left: 1px solid #EEE">
-							<h4 class="mb-1 text-center"><slot name="titleAlphaTile"></slot></h4>
-							<h6 class="text-muted text-center"><slot name="valueAlphaTile"></slot></h6>
-						</div>
-						<div v-if="hasTileUIDSlot" class="px-2" style="border-left: 1px solid #EEE">
-							<h4 class="mb-1 text-center">UID</h4>
-							<h6 class="text-muted text-center"><slot name="uid"></slot></h6>
-						</div>
-					</div>
-				</div>
-
+			</div>
 		</template>
 	</div>
 	`