Ferien import config: added comment

# Conflicts:
#	cis/testtool/menu.php
#	system/dbupdate_3.4.php

application/config/ferienimport.php

@@ -0,0 +1,6 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+// Link for download of Ferien days (should be csv)
+$config['ferien_import_link'] = 'https://www.wien.gv.at/gogv/l9ogdfeiertagskalender';

application/config/navigation.php

@@ -119,6 +119,15 @@ $config['navigation_header'] = array(
 					'requiredPermissions' => array(
 						'lehre/zgvpruefung:r'
 					)
+				),
+				'ferien' => array(
+					'link' => site_url('lehre/Ferienverwaltung'),
+					'description' => 'Ferienverwaltung',
+					'expand' => true,
+					'sort' => 55,
+					'requiredPermissions' => array(
+						'basis/ferien:r'
+					)
 				)
 			)
 		),

application/controllers/Cis/Compat.php

@@ -0,0 +1,44 @@
+<?php
+
+if (!defined('BASEPATH'))
+	exit('No direct script access allowed');
+
+class Compat extends Auth_Controller
+{
+
+	/**
+	 * Constructor
+	 */
+
+	public function __construct()
+	{
+		parent::__construct([
+			'ci' => ['basis/cis:r'],
+			'legacy' => ['basis/cis:r'],
+			
+		]);
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+
+	/**
+	 * @access public
+	 * @return void 
+	 */
+	public function ci()
+	{
+		$this->load->view('CisRouterView/CisRouterView.php',['route' => 'Compat']);
+	}
+
+	/**
+	 * @access public
+	 * @return void
+	 */
+	public function legacy()
+	{
+		$this->load->view('CisRouterView/CisRouterView.php',['route' => 'Compat']);
+	}
+
+}

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

@@ -67,8 +67,11 @@ class CisMenu extends FHCAPI_Controller
 
 	private function generateUrlForMenuItem($menuItem)
 	{
-		$menuItem->url = $this->menuItemUrlHelper($menuItem);
-		unset($menuItem->content);
+		if(!isset($menuItem->url))
+		{
+			$menuItem->url = $this->menuItemUrlHelper($menuItem);
+			unset($menuItem->content);
+		}
 
 		if ($menuItem->childs && count($menuItem->childs)) {
 			$menuItem->childs = $this->generateUrlsForMenuItems($menuItem->childs);
@@ -83,7 +86,7 @@ class CisMenu extends FHCAPI_Controller
 			return site_url("/CisVue/Cms/content/" . $menuItem->content_id);
 		}
 
-		if (!$menuItem->content || !mb_strlen($menuItem->content)) {
+		if (!isset($menuItem->content) || !$menuItem->content || !mb_strlen($menuItem->content)) {
 			return '';
 		}
 

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

@@ -0,0 +1,482 @@
+<?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
+ * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
+ */
+class Ferien extends FHCAPI_Controller
+{
+	const DEFAULT_BERECHTIGUNG = 'basis/ferien';
+	const FERIENTYP_KURZBZ = 'Feiertag';
+
+	/**
+	 * Calls the parent's constructor and prepares libraries and phrases
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'getFerien' => self::DEFAULT_BERECHTIGUNG.':r',
+			'getDefaultVonBis' => self::DEFAULT_BERECHTIGUNG.':r',
+			'getOe' => self::DEFAULT_BERECHTIGUNG.':r',
+			'getStudienplaene' => self::DEFAULT_BERECHTIGUNG.':r',
+			'getFerientypen' => self::DEFAULT_BERECHTIGUNG.':r',
+			'insert' => self::DEFAULT_BERECHTIGUNG.':w',
+			'update' => self::DEFAULT_BERECHTIGUNG.':w',
+			'delete' => self::DEFAULT_BERECHTIGUNG.':w',
+			'importFerien' => self::DEFAULT_BERECHTIGUNG.':w'
+		]);
+
+		// Load models
+		$this->load->model('organisation/Ferien_model', 'FerienModel');
+		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+
+		$this->load->library('PermissionLib');
+
+		$this->load->config('ferienimport');
+
+		// Load language phrases
+		$this->loadPhrases([
+			'ui'
+		]);
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * Get Ferien
+	 */
+	public function getFerien()
+	{
+		$filterVonDatum = $this->input->get('filterVonDatum');
+		$filterBisDatum = $this->input->get('filterBisDatum');
+
+		if (isset($filterVonDatum) && !is_valid_date($filterVonDatum))
+			return $this->terminateWithError($this->p->t('ui', 'error_invalid_date'), self::ERROR_TYPE_GENERAL);
+
+		if (isset($filterBisDatum) && !is_valid_date($filterBisDatum))
+			return $this->terminateWithError($this->p->t('ui', 'error_invalid_date'), self::ERROR_TYPE_GENERAL);
+
+		$this->FerienModel->addSelect(
+			'tbl_ferien.ferien_id, tbl_ferien.bezeichnung, tbl_ferien.vondatum, tbl_ferien.bisdatum,
+			plan.studienplan_id, oe.oe_kurzbz, fetyp.ferientyp_kurzbz, oe.bezeichnung AS oe_bezeichnung,
+			plan.studienplan_id, plan.bezeichnung AS studienplan_bezeichnung, fetyp.mitarbeiter AS mitarbeiterrelevant,
+			fetyp.studierende AS studierendenrelevant, fetyp.lehre'
+		);
+		$this->FerienModel->addJoin('public.tbl_studiengang stg', 'studiengang_kz', 'LEFT');
+		$this->FerienModel->addJoin('lehre.tbl_studienplan plan', 'studienplan_id', 'LEFT');
+		$this->FerienModel->addJoin('public.tbl_organisationseinheit oe', 'tbl_ferien.oe_kurzbz = oe.oe_kurzbz', 'LEFT');
+		$this->FerienModel->addJoin('lehre.tbl_ferientyp fetyp', 'ferientyp_kurzbz', 'LEFT');
+
+		if (isset($filterVonDatum))
+			$this->FerienModel->db->where('tbl_ferien.bisdatum >=', $filterVonDatum);
+
+		if (isset($filterBisDatum))
+			$this->FerienModel->db->where('tbl_ferien.vondatum <=', $filterBisDatum);
+
+		$this->FerienModel->addOrder('vondatum', 'DESC');
+		$result = $this->FerienModel->load();
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	/**
+	 * Gets default dates (from - to) for filtering Ferien.
+	 */
+	public function getDefaultVonBis()
+	{
+		$defaultVonBis = ['defaultVon' => null, 'defaultBis' => null];
+
+		// get current Studienjahr
+		$this->load->model('organisation/Studienjahr_model', 'StudienjahrModel');
+
+		$result = $this->StudienjahrModel->getAktOrNextStudienjahr(62);
+
+		if (isError($result)) return $this->terminateWithError(getError($result));
+
+		if (hasData($result))
+		{
+			$studienjahr = getData($result)[0];
+			$defaultVonBis['defaultVon'] = $studienjahr->beginn;
+			$defaultVonBis['defaultBis'] = $studienjahr->ende;
+		}
+
+		$this->terminateWithSuccess($defaultVonBis);
+	}
+
+	/**
+	 * Get list of Organisationseinheiten
+	 */
+	public function getOe()
+	{
+		$this->load->model('organisation/Organisationseinheit_model', 'OrganisationseinheitModel');
+
+		//$this->StudiengangModel->addSelect(' tbl_studiengang.*, UPPER(typ::varchar(1) || kurzbz) AS kuerzel');
+		$this->OrganisationseinheitModel->addOrder('organisationseinheittyp_kurzbz, oe_kurzbz');
+		$result = $this->OrganisationseinheitModel->loadWhere(['aktiv' => true]);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	/**
+	 * Get list of Studienplaene.
+	 * Studienplaene are returned by Organisationseinheit, von and bis datum.
+	 */
+	public function getStudienplaene()
+	{
+		// check input
+		$oe_kurzbz = $this->input->get('oe_kurzbz');
+		$vondatum = $this->input->get('vondatum');
+		$bisdatum = $this->input->get('bisdatum');
+
+		if (!isset($oe_kurzbz) || isEmptyString($oe_kurzbz))
+			return $this->terminateWithError($this->p->t('ferien', 'error_missingId', ['id' => 'Organisationseinheit']));
+
+		if (isset($vondatum) && !is_valid_date($vondatum))
+			return $this->terminateWithError($this->p->t('ui', 'error_invalid_date'), self::ERROR_TYPE_GENERAL);
+
+		if (isset($bisdatum) && !is_valid_date($bisdatum))
+			return $this->terminateWithError($this->p->t('ui', 'error_invalid_date'), self::ERROR_TYPE_GENERAL);
+
+		// get Studiengang from Oe
+		$result = $this->StudiengangModel->loadWhere(['oe_kurzbz' => $oe_kurzbz]);
+
+		if (isError($result)) return $this->terminateWithError(getError($result));
+		if (!hasData($result)) return $this->terminateWithSuccess([]);
+		$studiengangKzArr = array_column(getData($result), 'studiengang_kz');
+
+		// load models
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+		$this->load->model('organisation/Studienplan_model', 'StudienplanModel');
+
+		// get all Studiensemester in requested date range
+		$result = $this->StudiensemesterModel->getByDateRange($vondatum, $bisdatum);
+		if (isError($result)) return $this->terminateWithError(getError($result));
+		if (!hasData($result)) return $this->terminateWithSuccess([]);
+		$studiensemesterArr = array_column(getData($result), 'studiensemester_kurzbz');
+
+		$studienplaene = [];
+		foreach ($studiengangKzArr as $studiengang_kz)
+		{
+			foreach ($studiensemesterArr as $studiensemester_kurzbz)
+			{
+				// get studienplaene for each Studiengang and Studiensemester
+				$this->StudienplanModel->addDistinct("studienplan_id");
+				$this->StudienplanModel->addSelect("lehre.tbl_studienplan.*");
+				$this->StudienplanModel->addJoin("lehre.tbl_studienordnung", "studienordnung_id");
+				$this->StudienplanModel->addJoin("lehre.tbl_studienplan_semester", "studienplan_id");
+
+				$whereArray = array(
+					"tbl_studienplan.aktiv" => "TRUE",
+					"tbl_studienordnung.studiengang_kz" => $studiengang_kz,
+					"tbl_studienplan_semester.studiensemester_kurzbz" => $studiensemester_kurzbz
+				);
+
+				$result = $this->StudienplanModel->loadWhere($whereArray);
+
+				if (isError($result)) return $this->terminateWithError(getError($result));
+				if (!hasData($result)) continue;
+
+				foreach (getData($result) as $studienplan)
+				{
+					$studienplaene[$studienplan->studienplan_id] = $studienplan;
+				}
+			}
+		}
+
+		$this->terminateWithSuccess($studienplaene);
+	}
+
+	/**
+	 * Get list of Ferientypen
+	 */
+	public function getFerientypen()
+	{
+		$this->load->model('organisation/Ferientyp_model', 'FerientypModel');
+
+		$this->FerientypModel->addOrder('ferientyp_kurzbz');
+		$result = $this->FerientypModel->load();
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess($data);
+	}
+
+	/**
+	 * Add Ferien
+	 */
+	public function insert()
+	{
+		$this->_validate();
+
+		$data = $this->_getData();
+
+		// check permissions for new Ferien
+		if (!$this->permissionlib->isBerechtigt(self::DEFAULT_BERECHTIGUNG, 'suid', $data['oe_kurzbz']))
+			return $this->terminateWithError($this->p->t('ui', 'keineBerechtigung'));
+
+		$data = array_merge($data, ['insertamum' => date('c'), 'insertvon' => getAuthUID()]);
+
+		$id = $this->getDataOrTerminateWithError($this->FerienModel->insert($data));
+
+		$this->terminateWithSuccess(hasData($id) ? getData($id) : null);
+	}
+
+	/**
+	 * Update Ferien
+	 */
+	public function update()
+	{
+		$id = $this->input->post('ferien_id');
+
+		if (!is_numeric($id))
+			return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Ferien Id']), self::ERROR_TYPE_GENERAL);
+
+		$this->_validate();
+
+		$data = $this->_getData();
+
+		// check permissions for existing Ferien
+		$this->_validateBerechtigung('suid', $id);
+
+		// check permissions for new Ferien
+		if (!$this->permissionlib->isBerechtigt(self::DEFAULT_BERECHTIGUNG, 'suid', $data['oe_kurzbz']))
+			return $this->terminateWithError($this->p->t('ui', 'keineBerechtigung'));
+
+		if (isEmptyArray($data)) return $this->terminateWithSuccess(null);
+
+		$data = array_merge($data, ['ferien_id' => $id, 'updateamum' => date('c'), 'updatevon' => getAuthUID()]);
+
+		$result = $this->FerienModel->update($id, $data);
+
+		if (isError($result)) return $this->terminateWithError(getError($result));
+
+		$this->terminateWithSuccess($id);
+	}
+
+	/**
+	 * Delete Ferien
+	 */
+	public function delete()
+	{
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('ferien_id', 'Ferien Id', 'required');
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+
+		$ferien_id = $this->input->post('ferien_id');
+
+		$this->_validateBerechtigung('suid', $ferien_id);
+
+		$this->FerienModel->addSelect('ferien_id');
+		$result = $this->FerienModel->load($ferien_id);
+
+		if (!hasData($result)) return $this->terminateWithError($this->p->t('ui', 'error_missingId', ['ferien_id' => $ferien_id]));
+
+		$result = $this->getDataOrTerminateWithError($this->FerienModel->delete($ferien_id));
+
+		$this->terminateWithSuccess();
+	}
+
+	/**
+	 * Import Ferien from external source
+	 */
+	public function importFerien()
+	{
+		$filterVonDatum = $this->input->get('filterVonDatum');
+		$filterBisDatum = $this->input->get('filterBisDatum');
+
+		if (isset($filterVonDatum) && !is_valid_date($filterVonDatum))
+			return $this->terminateWithError($this->p->t('ui', 'error_invalid_date'), self::ERROR_TYPE_GENERAL);
+
+		if (isset($filterBisDatum) && !is_valid_date($filterBisDatum))
+			return $this->terminateWithError($this->p->t('ui', 'error_invalid_date'), self::ERROR_TYPE_GENERAL);
+
+		$noImported = 0;
+
+		$data = file_get_contents($this->config->item('ferien_import_link'));
+
+		if (!$data) return $this->terminateWithError($this->p->t('ferien', 'csvNichtGelesen'), self::ERROR_TYPE_GENERAL);
+
+		$rows = explode("\n", $data);
+		$headers = [];
+		$ferien = [];
+		$headerRow = true;
+
+		foreach($rows as $row)
+		{
+			/*
+			 * Wenn escape auf etwas anderes als eine leere Zeichenkette ("") gesetzt wird, kann dies zu einer CSV-Datei führen,
+			 * die nicht mit » RFC 4180 konform ist oder die den Umlauf durch die PHP-CSV-Funktionen nicht übersteht.
+			 * Der Standardwert für escape ist "\\", weshalb empfohlen wird, diesen Parameter explizit auf eine leere Zeichenkette zu setzen.
+			 */
+
+			$fe = str_getcsv($row, ",", "\"", '');
+			if ($headerRow)
+			{
+				$headers = $fe;
+			}
+			else
+			{
+				$importedFerien = [];
+				foreach ($fe as $idx => $value)
+				{
+					if (!isset($headers[$idx])) continue;
+					$importedFerien[$headers[$idx]] = $value;
+				}
+
+				// map Ferien so they can be imported
+				$ferien = $this->_mapImportFerien($importedFerien);
+
+				// do not import Ferien if no successfull import or not in date range
+				if (
+					!$ferien
+					|| ($filterVonDatum != null && new DateTime($filterVonDatum) > new DateTime($ferien['bisdatum']))
+					|| ($filterBisDatum != null && new DateTime($filterBisDatum) < new DateTime($ferien['vondatum']))
+				) continue;
+
+				$result = $this->FerienModel->loadWhere([
+					'vondatum' => $ferien['vondatum'],
+					'bisdatum' => $ferien['bisdatum'],
+					'bezeichnung' => $ferien['bezeichnung'],
+					'oe_kurzbz' => null
+				]);
+
+				if (isError($result)) return $this->terminateWithError($this->p->t('ferien', 'fehlerBeimLaden'), self::ERROR_TYPE_GENERAL);
+
+				// add Ferien if there have been 
+				if (!hasData($result))
+				{
+					$result = $this->FerienModel->insert($ferien);
+					if (isError($result)) return $this->terminateWithError($this->p->t('ferien', 'fehlerBeimHinzufuegen'), self::ERROR_TYPE_GENERAL);
+					$noImported++;
+				}
+			}
+
+			$headerRow = false;
+		}
+		$this->terminateWithSuccess($noImported);
+	}
+
+	/**
+	 * Validate ferien post input.
+	 */
+	private function _validate()
+	{
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('vondatum', 'Von Datum', 'required|is_valid_date');
+		$this->form_validation->set_rules('bisdatum', 'Bis Datum', 'required|is_valid_date');
+		$this->form_validation->set_rules('bezeichnung', 'Bezeichnung', 'required|max_length[128]');
+		$this->form_validation->set_rules('oe_kurzbz', 'Organisationseinheit', 'max_length[32]');
+		$this->form_validation->set_rules('studienplan_id', 'Studienplan', 'numeric');
+		$this->form_validation->set_rules('ferientyp_kurzbz', 'Ferientyp', 'max_length[64]');
+
+		if (!$this->form_validation->run())
+			$this->terminateWithValidationErrors($this->form_validation->error_array());
+	}
+
+	/**
+	 * Checks permission for oe of Ferien. Terminates if unauthorized.
+	 * @param typ permission type suid
+	 * @param ferien_id
+	 * @return void
+	 */
+	private function _validateBerechtigung($typ, $ferien_id)
+	{
+		if (isset($ferien_id))
+		{
+			$this->FerienModel->addSelect('oe_kurzbz');
+			$result = $this->FerienModel->load($ferien_id);
+
+			if (isError($result)) return $this->terminateWithError(getError($result));
+
+			if (hasData($result))
+			{
+				$ferien = getData($result)[0];
+
+				if ($this->permissionlib->isBerechtigt(self::DEFAULT_BERECHTIGUNG, $typ, $ferien->oe_kurzbz)) return;
+			}
+		}
+
+		return $this->terminateWithError($this->p->t('ui', 'keineBerechtigung'));
+	}
+
+	/**
+	 * Gets Ferien data from post input.
+	 */
+	private function _getData()
+	{
+		$data = [];
+
+		$allowed = [
+			'vondatum',
+			'bisdatum',
+			'bezeichnung',
+			'oe_kurzbz',
+			'studienplan_id',
+			'ferientyp_kurzbz'
+		];
+
+		foreach ($allowed as $field)
+		{
+			$data[$field] = $this->input->post($field);
+		}
+
+		return $data;
+	}
+
+	/**
+	 * Map ferien from external source to internal format 
+	 * @param $importedFerien from external source
+	 * @return array imported Ferien, in fhcomplete format
+	 */
+	private function _mapImportFerien($importedFerien)
+	{
+		$mappings = [
+			'vondatum' => 'DATUM',
+			'bisdatum' => 'DATUM',
+			'bezeichnung' => 'TEXT'
+		];
+
+		$ferien = [
+			'ferientyp_kurzbz' => self::FERIENTYP_KURZBZ,
+			'insertamum' => date('c'),
+			'insertvon' => getAuthUID()
+		];
+
+		foreach ($mappings as $key => $name)
+		{
+			if (!isset($importedFerien[$name])) return null;
+			$ferien[$key] = $importedFerien[$name];
+		}
+
+		return $ferien;
+	}
+}

application/controllers/lehre/Ferienverwaltung.php

@@ -0,0 +1,44 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * Ferien management
+ */
+class Ferienverwaltung extends Auth_Controller
+{
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct(
+			array(
+				'index' => ['basis/ferien:r']
+			)
+		);
+
+		// Loads WidgetLib
+		//$this->load->library('WidgetLib');
+
+		// Loads phrases system
+		$this->loadPhrases(
+			array(
+				'global',
+				'ui'
+				//'ferien'
+			)
+		);
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * Everything has a beginning
+	 */
+	public function index()
+	{
+		$this->load->view('lehre/ferienverwaltung.php');
+	}
+}

application/libraries/StundenplanLib.php

@@ -405,11 +405,7 @@ class StundenplanLib
 
 		$tz = new DateTimeZone($this->_ci->config->item('timezone'));
 
-		$ferienEvents = $this->_ci->FerienModel->execReadOnlyQuery("
-		SELECT * 
-		FROM lehre.tbl_ferien
-		WHERE (bisdatum >= ? AND vondatum < ?) AND (studiengang_kz = 0 OR studiengang_kz = ?)
-		", [$start_date, $end_date, $studiengang_kz]);
+		$ferienEvents = $this->_ci->FerienModel->getByDateRange($start_date, $end_date, $studiengang_kz);
 
 		if (isError($ferienEvents))
 			return $ferienEvents;

application/models/organisation/Ferien_model.php

@@ -9,6 +9,52 @@ class Ferien_model extends DB_Model
 	{
 		parent::__construct();
 		$this->dbTable = 'lehre.tbl_ferien';
-		$this->pk = array('studiengang_kz', 'bezeichnung');
+		$this->pk = 'ferien_id';
+	}
+
+	/**
+	 * Loads all Ferien between two dates.
+	 * @param $vondatum
+	 * @param $bisdatum
+	 * @param $studiengang_kz by default, loads only Ferien from oe of 0 Studiengang (and parents)
+	 * @return object success or error
+	 */
+	public function getByDateRange($vondatum, $bisdatum, $studiengang_kz = 0)
+	{
+		if (!is_numeric($studiengang_kz)) return error("Invalid Studiengang Kz");
+		if (!is_valid_date($vondatum)) return error("Invalid von date");
+		if (!is_valid_date($bisdatum)) return error("Invalid bis date");
+
+		// get oe from studiengang
+		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+		$result = $this->StudiengangModel->loadWhere(['studiengang_kz' => $studiengang_kz]);
+
+		if (isError($result)) return $result;
+		if (!hasData($result)) return success([]);
+
+		$oe_kurzbz = getData($result)[0]->oe_kurzbz;
+
+		// get all parents oes
+		$this->load->model('organisation/Organisationseinheit_model', 'OrganisationseinheitModel');
+		$result = $this->OrganisationseinheitModel->getParents($oe_kurzbz);
+
+		if (isError($result)) return $result;
+		if (!hasData($result)) return success([]);
+
+		$parents = array_column(getData($result), 'oe_kurzbz');
+
+		// get ferien - use oe_kurzbz
+		$qry = "
+			SELECT
+				*
+			FROM
+				lehre.tbl_ferien
+			WHERE
+				bisdatum >= ? AND vondatum < ?
+				AND (oe_kurzbz IS NULL OR oe_kurzbz IN ?)
+			ORDER BY
+				vondatum";
+
+		return $this->execReadOnlyQuery($qry, [$vondatum, $bisdatum, $parents]);
 	}
 }

application/models/organisation/Ferientyp_model.php

@@ -0,0 +1,15 @@
+<?php
+class Ferientyp_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'lehre.tbl_ferientyp';
+		$this->pk = 'ferientyp_kurzbz';
+		$this->hasSequence = false;
+	}
+}

application/models/organisation/Studienjahr_model.php

@@ -53,11 +53,9 @@ class Studienjahr_model extends DB_Model
 	 * @param int $days
 	 * @return array|stdClass|null
 	 */
-	public function getLastOrAktStudienjahr($days = 60)
+	public function getLastOrAktStudienjahr($days = 0)
 	{
-		if (!is_numeric($days)) {
-			$days = 60;
-		}
+		$days = is_numeric($days) ? $this->escape($days) : 0;
 
 		$query = '
 			SELECT *
@@ -77,19 +75,25 @@ class Studienjahr_model extends DB_Model
 	 * @param int $days
 	 * @return array|stdClass|null
 	 */
-	public function getAktOrNextStudienjahr($days = 62)
+	public function getAktOrNextStudienjahr($days = 0)
 	{
-		if (!is_numeric($days)) {
-			$days = 62;
-		}
+		$days = is_numeric($days) ? $this->escape($days) : 0;
 
 		$query = '
-			SELECT *
-			FROM public.tbl_studienjahr
-			JOIN public.tbl_studiensemester using(studienjahr_kurzbz)
-			WHERE start < NOW() + \'' . $days . ' DAYS\'::INTERVAL
-			ORDER by start DESC
-			LIMIT 1
+				SELECT * FROM (
+					SELECT
+						jahr.*, MIN(sem.start) AS beginn,  MAX(sem.ende) AS ende
+					FROM
+						public.tbl_studienjahr jahr
+						JOIN public.tbl_studiensemester sem using(studienjahr_kurzbz)
+					GROUP BY
+						studienjahr_kurzbz
+				) jahre
+				WHERE
+					ende >= NOW() + \'' . $days . ' DAYS\'::INTERVAL
+				ORDER BY
+					ende
+				LIMIT 1
 		';
 
 		return $this->execQuery($query);

application/views/lehre/ferienverwaltung.php

@@ -0,0 +1,27 @@
+<?php
+	$includesArray = array(
+		'title' => 'Ferienverwaltung',
+		'axios027' => true,
+		'bootstrap5' => true,
+		'fontawesome6' => true,
+		'vue3' => true,
+		'filtercomponent' => true,
+		'navigationcomponent' => true,
+		'tabulator6' => true,
+		'primevue3' => true,
+		//'vuedatepicker11' => true,
+		'customJSModules' => array('public/js/apps/lehre/Ferienverwaltung/Ferienverwaltung.js'),
+		'customCSSs' => array('vendor/vuejs/vuedatepicker_css/main.css')
+	);
+
+	$this->load->view('templates/FHC-Header', $includesArray);
+?>
+
+<div id="main">
+	<div>
+		<ferienverwaltung></ferienverwaltung>
+	</div>
+</div>
+
+<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
+

cis/testtool/login.php

@@ -632,6 +632,7 @@ elseif (isset($prestudent_id))
 
 				$ps_obj->lastStatus = $ps_tmp->status_kurzbz; // letzten Status dem result array hinzufügen
 				$ps_obj->status_mehrsprachig = $ps_tmp->status_mehrsprachig;
+				$ps_obj->ausbildungssemester = $ps_tmp->ausbildungssemester;
 			}
 
 			// Falls Status 'Abgewiesene' vorhanden, nach hinten reihen

cis/testtool/menu.php

@@ -29,6 +29,7 @@ require_once('../../include/sprache.class.php');
 require_once '../../include/phrasen.class.php';
 require_once '../../include/studiengang.class.php';
 require_once('../../include/gebiet.class.php');
+require_once('../../include/gebiet_pruefling.class.php');
 
 if (!$db = new basis_db())
 	die('Fehler beim Oeffnen der Datenbankverbindung');
@@ -198,8 +199,8 @@ else if (isset($_SESSION['pruefling_id']))
 		)
 
 
-		SELECT DISTINCT ON
-			(gebiet_id, semester, reihung)
+		SELECT * FROM (SELECT DISTINCT ON
+			(gebiet_id)
 			semester,
 			gebiet_id,
 			STRING_AGG(studiengang_kz::TEXT, ', ' ORDER BY studiengang_kz) AS studiengang_kz_list,
@@ -226,13 +227,7 @@ else if (isset($_SESSION['pruefling_id']))
 				JOIN
 					testtool.tbl_gebiet USING (gebiet_id)
 				WHERE
-					(
-						(prestudent_data.semester= 1 AND tbl_ablauf.semester = 1)
-						OR
-						(prestudent_data.semester= 2 AND tbl_ablauf.semester = 2)
-						OR
-						(prestudent_data.semester= 3 AND tbl_ablauf.semester IN (1,3))
-					)
+					tbl_ablauf.semester <= prestudent_data.semester
 				AND (   
 						prestudent_data.studienplan_id = tbl_ablauf.studienplan_id
 						OR
@@ -259,9 +254,7 @@ else if (isset($_SESSION['pruefling_id']))
 				JOIN
 					testtool.tbl_gebiet USING (gebiet_id)
 				WHERE
-					(prestudent_data.semester= 1 AND tbl_ablauf.semester = 1)
-				OR
-					(prestudent_data.semester= 3 AND tbl_ablauf.semester IN (1,3))
+					tbl_ablauf.semester <= prestudent_data.semester
 				)
 			) temp
 		) temp2
@@ -270,7 +263,7 @@ else if (isset($_SESSION['pruefling_id']))
 			semester,
 			 gebiet_id,
 			 bezeichnung,
-			". $bezeichnung_mehrsprachig_sel ." 
+			". $bezeichnung_mehrsprachig_sel ." ) temp3
 
 		ORDER BY
 			semester,
@@ -283,6 +276,8 @@ else if (isset($_SESSION['pruefling_id']))
 	$lastsemester = '';
 	$quereinsteiger_stg = '';
 	$_SESSION['alleGebiete']= [];
+	$gebiet_pruefling = new gebiet_pruefling();
+	$quereinsteiger_menu = false;
 	while($row = $db->db_fetch_object($result))
 	{
 		//Jedes Semester in einer eigenen Tabelle anzeigen
@@ -294,8 +289,25 @@ else if (isset($_SESSION['pruefling_id']))
 			}
 			$lastsemester = $row->semester;
 
-			echo '<table border="0" cellspacing="0" cellpadding="0" id="Gebiet" style="display: visible; border-collapse: separate; border-spacing: 0 3px; margin-top: 5px;">';
-			echo '<tr><td class="HeaderTesttool">'. ($row->semester == '1' ? $p->t('testtool/basisgebiete') : $p->t('testtool/quereinstiegsgebiete')).'</td></tr>';
+			if ($row->semester == '1')
+			{
+				// Basisgebiete anzeigen
+				echo '<table border="0" cellspacing="0" cellpadding="0" id="Gebiet" style="display: visible; border-collapse: separate; border-spacing: 0 3px; margin-top: 5px;">';
+				echo '<tr><td class="HeaderTesttool">' . $p->t('testtool/basisgebiete') . '</td></tr>';
+			}
+			else
+			{
+				if (!$quereinsteiger_menu)
+				{
+					echo '<table border="0" cellspacing="0" cellpadding="0" id="Gebiet" style="display: visible; border-collapse: separate; border-spacing: 0 3px; margin-top: 5px;">';
+					echo '<tr><td class="HeaderTesttool">' . $p->t('testtool/quereinstiegsgebiete') . '</td></tr>';
+					$quereinsteiger_menu = true;
+				}
+				else
+				{
+					echo '<table border="0" cellspacing="0" cellpadding="0" id="Gebiet" style="display: visible; border-collapse: separate; border-spacing: 0 3px; margin-top: 5px;">';
+				}
+			}
 		}
 
 		// Bei Quereinstiegsgebieten nach STG clustern und die STG anzeigen
@@ -394,6 +406,12 @@ else if (isset($_SESSION['pruefling_id']))
 						</td>
 					<!--<td width="10" class="ItemTesttoolRight" nowrap>&nbsp;</td>-->
 					</tr>';
+			if (!$gebiet_pruefling->checkIfExists($_SESSION['pruefling_id'], $row->gebiet_id))
+			{
+				$gebiet_pruefling->pruefling_id = $_SESSION['pruefling_id'];
+				$gebiet_pruefling->gebiet_id = $row->gebiet_id;
+				$gebiet_pruefling->saveGebietForPruefling();
+			}
 			$_SESSION['alleGebiete'][] = $row->gebiet_id;
 		}
 		else

include/ferien.class.php

@@ -24,6 +24,7 @@
  * @create 07-12-2006
  */
 require_once(dirname(__FILE__).'/basis_db.class.php');
+require_once(dirname(__FILE__).'/organisationseinheit.class.php');
 
 class ferien extends basis_db 
 {
@@ -62,8 +63,50 @@ class ferien extends basis_db
 			$this->errormsg = 'Studiengang_kz ist ungültig';
 			return false;
 		}
+
+		// get oe from studiengang
+		$sql_query="
+			SELECT
+				oe_kurzbz
+			FROM
+				public.tbl_studiengang
+			WHERE
+				studiengang_kz=".$this->db_add_param($stg_kz, FHC_INTEGER)."
+			ORDER BY
+				studiengang_kz";
 		
-		$sql_query="SELECT * FROM lehre.tbl_ferien WHERE studiengang_kz=0 OR studiengang_kz=".$this->db_add_param($stg_kz, FHC_INTEGER)." ORDER BY vondatum;";
+		if (!$this->db_query($sql_query))
+		{
+			$this->errormsg = $this->db_last_error();
+			return false;
+		}
+
+		$oe_kurzbz = '';
+		while ($row = $this->db_fetch_object())
+		{
+			$oe_kurzbz = $row->oe_kurzbz;
+		}
+
+		// get all parents oes
+		$organisationseinheit = new organisationseinheit();
+		$parents = $organisationseinheit->getParents($oe_kurzbz);
+
+		if (!$parents)
+		{
+			$this->errormsg = $parents->errormsg;
+			return false;
+		}
+
+		$sql_query="
+			SELECT
+				*
+			FROM
+				lehre.tbl_ferien
+			WHERE
+				oe_kurzbz IS NULL
+				OR oe_kurzbz IN (".$this->implode4SQL($parents).")
+			ORDER BY
+				vondatum";
 		
 		if (!$this->db_query($sql_query))
 		{

include/gebiet_pruefling.class.php

@@ -0,0 +1,97 @@
+<?php
+/* Copyright (C) 2024 Technikum-Wien
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ */
+require_once(dirname(__FILE__).'/basis_db.class.php');
+
+class gebiet_pruefling extends basis_db
+{
+	//Tabellenspalten
+	public $prueflinggebiet_id;
+	public $pruefling_id;
+	public $gebiet_id;
+	public $insertamum;
+
+
+	public function __construct()
+	{
+		parent::__construct();
+	}
+
+	public function loadByPruefling($pruefling_id)
+	{
+		$qry = "SELECT *
+     			FROM testtool.tbl_pruefling_gebiet
+     			WHERE pruefling_id = ".$this->db_add_param($pruefling_id, FHC_INTEGER);
+
+		if($this->db_query($qry))
+		{
+			if($row = $this->db_fetch_object())
+			{
+				$this->prueflinggebiet_id = $row->prueflinggebiet_id;
+				$this->pruefling_id = $row->pruefling_id;
+				$this->gebiet_id = $row->gebiet_id;
+				return true;
+			}
+			else
+			{
+				$this->errormsg = "Pruefling nicht gefunden";
+				return false;
+			}
+		}
+		else
+		{
+			$this->errormsg = "Fehler beim Laden der Gebiete für den Pruefling";
+			return false;
+		}
+	}
+
+	public function checkIfExists($pruefling_id, $gebiet_id)
+	{
+		$qry = "SELECT 1 
+				FROM testtool.tbl_pruefling_gebiet 
+				WHERE pruefling_id =".$this->db_add_param($pruefling_id, FHC_INTEGER) ." AND gebiet_id =".$this->db_add_param($gebiet_id, FHC_INTEGER);
+
+		if ($result = $this->db_query($qry))
+		{
+			if ($this->db_num_rows($result) > 0)
+				return true;
+			else
+				return false;
+		}
+	}
+
+	public function saveGebietForPruefling()
+	{
+		$qry = "INSERT INTO testtool.tbl_pruefling_gebiet 
+    					(pruefling_id, gebiet_id)
+				VALUES(".
+			$this->db_add_param($this->pruefling_id, FHC_INTEGER).','.
+			$this->db_add_param($this->gebiet_id, FHC_INTEGER).');';
+
+		if ($this->db_query($qry))
+		{
+			return true;
+		}
+		else
+		{
+			$this->errormsg = 'Fehler beim Speichern der Daten';
+			return true;
+		}
+	}
+
+}
+?>

public/js/api/factory/ferienverwaltung/ferienverwaltung.js

@@ -0,0 +1,89 @@
+/**
+ * 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 {
+	getFerien(filterVonDatum, filterBisDatum) {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/education/ferien/getFerien',
+			params: {
+				filterVonDatum,
+				filterBisDatum
+			}
+		};
+	},
+	getOe() {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/education/ferien/getOe'
+		};
+	},
+	getStudienplaene(oe_kurzbz, vondatum, bisdatum) {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/education/ferien/getStudienplaene',
+			params: {
+				oe_kurzbz,
+				vondatum,
+				bisdatum
+			}
+		};
+	},
+	getFerientypen() {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/education/ferien/getFerientypen'
+		};
+	},
+	getDefaultVonBis() {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/education/ferien/getDefaultVonBis'
+		};
+	},
+	insert(params) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/education/ferien/insert',
+			params
+		};
+	},
+	update(params) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/education/ferien/update',
+			params
+		};
+	},
+	delete(ferien_id) {
+		return {
+			method: 'post',
+			url: 'api/frontend/v1/education/ferien/delete',
+			params: { ferien_id }
+		};
+	},
+	importFerien(filterVonDatum, filterBisDatum) {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/education/ferien/importFerien',
+			params: {
+				filterVonDatum,
+				filterBisDatum
+			}
+		};
+	},
+};

public/js/apps/Cis/Cis.js

@@ -19,6 +19,7 @@ import DeadlineOverview from "../../components/Cis/Abgabetool/DeadlineOverview.j
 import Studium from "../../components/Cis/Studium/Studium.js";
 import StgOrgLvPlan from "../../components/Cis/LvPlan/StgOrg.js";
 import OtherLvPlan from "../../components/Cis/LvPlan/OtherLvPlan.js";
+import Compat from "../../components/Cis/Compat.js";
 
 import ApiRouteInfo from '../../api/factory/routeinfo.js';
 import {capitalize} from "../../helpers/StringHelpers.js";
@@ -29,6 +30,18 @@ const isMobile = window.matchMedia("(max-width: 767px)").matches;
 const router = VueRouter.createRouter({
 	history: VueRouter.createWebHistory(`/${ciPath}`),
 	routes: [
+		{
+			path: `/Cis/Compat/:mode(ci|legacy)/:path(.*)`,
+			name: 'Compat',
+			component: Compat,
+			props: (route) => {
+				return {
+					mode: route.params.mode,
+					path: route.params.path,
+					query_string: VueRouter.stringifyQuery(route.query)
+				};
+			}
+		},
 		{
 			path: `/Cis/Studium`,
 			name: 'Studium',
@@ -277,7 +290,7 @@ const app = Vue.createApp({
 			if (target && this.isInternalRoute(target.href)) {
 				const url = new URL(target.href)
 				
-				const path = url.pathname
+				const path = url.pathname + url.search;
 				const base = this.$router.options.history.base
 				const route = path.replace(base, '') || '/'
 

public/js/apps/lehre/Ferienverwaltung/Ferienverwaltung.js

@@ -0,0 +1,12 @@
+import Ferienverwaltung from '../../../components/Ferienverwaltung/Ferienverwaltung.js';
+import PluginsPhrasen from '../../../plugins/Phrasen.js';
+
+const app = Vue.createApp({
+	name: 'FerienverwaltungApp',
+	components: {
+		Ferienverwaltung
+	}
+});
+app
+	.use(PluginsPhrasen)
+	.mount('#main');

public/js/components/Cis/Compat.js

@@ -0,0 +1,93 @@
+export default {
+	name: "Compat",
+	props: {
+		mode: { type: String, required: true },
+		path: { type: String, required: true },
+		query_string: { type: String, required: true, default: ''}
+	},
+	data: function() {
+		return {
+			lastLoadediFrameURL: '',
+			srcUrl: ''
+		};
+	},
+	computed: {
+		propsWatchHelper: function() {
+			return this.mode + '#' + this.path + '#' + this.query_string;
+		}
+	},
+	mounted: function() {
+		this.srcUrl = this.buildSrcUrl();
+	},
+	watch: {
+		propsWatchHelper: function() {
+			if(this.lastLoadediFrameURL === '') {
+				return;
+			}
+
+			let currentiFrameURL = this.$refs.compatiframe ? this.$refs.compatiframe.src : '';
+
+			let url = this.buildSrcUrl();
+			if(this.lastLoadediFrameURL !== url) {
+				this.srcUrl = url;
+				if(this.srcUrl === url) {
+					this.$refs.compatiframe.contentWindow.location.href = url;
+				}
+			}
+		}
+	},
+	methods: {
+		buildSrcUrl: function() {
+			let url = false;
+			switch(this.mode) {
+				case 'ci':
+					url = FHC_JS_DATA_STORAGE_OBJECT.app_root + 'index.ci.php/' + this.path;
+					break;
+				case 'legacy':
+					url = FHC_JS_DATA_STORAGE_OBJECT.app_root + this.path;
+					break;
+				default:
+					url = false;
+			}
+			if(this.query_string !== '' && url) {
+				url += '?' + this.query_string;
+			}
+
+			return url;
+		},
+		loadHandler: function() {
+			let iframe_href = this.$refs.compatiframe.contentWindow.location.href;
+			let ci_urlstart = FHC_JS_DATA_STORAGE_OBJECT.app_root + 'index.ci.php/';
+			let legacy_urlstart = FHC_JS_DATA_STORAGE_OBJECT.app_root;
+			let routerpath = null;
+
+			this.lastLoadediFrameURL = iframe_href;
+
+			if(iframe_href.startsWith(ci_urlstart)) {
+				routerpath = iframe_href.replace(
+					ci_urlstart, '/Cis/Compat/ci/');
+			} else if(iframe_href.startsWith(legacy_urlstart)) {
+				routerpath = iframe_href.replace(
+					legacy_urlstart, '/Cis/Compat/legacy/');
+			} else {
+				return;
+			}
+
+			if(this.$route.fullPath !== routerpath) {
+				this.$router.push(routerpath);
+			}
+		}
+	},
+	template: `
+		<div class="w-100">
+			<iframe
+				ref="compatiframe"
+				v-if="srcUrl"
+				:src="srcUrl"
+				@load="loadHandler"
+				style="width:100%; height:90vh; border:0; display:block;"
+			></iframe>
+		<div v-else class="alert alert-warning">Keine URL gefunden.</div>
+		</div>
+	`
+};

public/js/components/DetailHeader/DetailHeader.js

@@ -542,10 +542,10 @@ export default {
 
 		<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="foto-container d-flex flex-column align-items-center h-100 position-relative d-inline-block">
 					<img
-					  class="d-block w-100 h-100 rounded"
-					  style="height: 84px; object-fit: contain;"
+					  class="d-block rounded"
+					  style="height: 96px;"
 					  alt="Profilbild"
 					  :src="getFotoSrc(headerDataMa.foto)"
 					/>
@@ -558,15 +558,13 @@ export default {
 					<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%;"
+							class="fotoedit buttonleft btn btn-outline-dark btn-sm d-flex justify-content-center align-items-center position-absolute start-0"
 							@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%;"
+							class="fotoedit buttonright btn btn-outline-dark btn-sm d-flex justify-content-center align-items-center position-absolute end-0"
 							@click="showModal(person_id)">
 							<i class="fa fa-pen"></i>
 						</button>

public/js/components/Ferienverwaltung/Ferienverwaltung.js

@@ -0,0 +1,304 @@
+import {CoreFilterCmpt} from "../filter/Filter.js";
+import {CoreNavigationCmpt} from "../navigation/Navigation.js";
+import FormInput from "../Form/Input.js";
+import FerienModal from "./Modal.js";
+
+import ApiFerienverwaltung from '../../api/factory/ferienverwaltung/ferienverwaltung.js';
+
+export default {
+	name: "Ferienverwaltung",
+	components: {
+		CoreFilterCmpt,
+		CoreNavigationCmpt,
+		FormInput,
+		FerienModal
+	},
+	data() {
+		return {
+			filterVonDatum: null,
+			filterBisDatum: null,
+			loading: false,
+			sideMenuEntries: {},
+			headerMenuEntries: {},
+			tabulatorOptions: {
+				ajaxURL: 'dummy',
+				ajaxRequestFunc: () => this.$api.call(
+					ApiFerienverwaltung.getFerien(this.filterVonDatum, this.filterBisDatum)
+				),
+				ajaxResponse: (url, params, response) => response.data,
+				columns: [
+					{title:"Ferien Id", field:"ferien_id", visible: false, headerFilter: true},
+					{
+						title:"Datum von",
+						field:"vondatum",
+						headerFilter: true,
+						formatter: function (cell) {
+							const dateStr = cell.getValue();
+							if (!dateStr) return "";
+
+							const date = new Date(dateStr);
+							return date.toLocaleString("de-DE", {
+								day: "2-digit",
+								month: "2-digit",
+								year: "numeric",
+								hour12: false
+							});
+						}
+					},
+					{
+						title:"Datum bis",
+						field:"bisdatum",
+						headerFilter: true,
+						formatter: function (cell) {
+							const dateStr = cell.getValue();
+							if (!dateStr) return "";
+
+							const date = new Date(dateStr);
+							return date.toLocaleString("de-DE", {
+								day: "2-digit",
+								month: "2-digit",
+								year: "numeric",
+								hour12: false
+							});
+						}
+					},
+					{title:"Bezeichnung", field:"bezeichnung", headerFilter: true},
+					{title:"Organisationseinheit Kurzbezeichnung", field:"oe_kurzbz", visible: false, headerFilter: true},
+					{title:"Organisationseinheit", field:"oe_bezeichnung", headerFilter: true},
+					{title:"Studienplan", field:"studienplan_bezeichnung", visible: false, headerFilter: true},
+					{title:"Ferientyp Kurzbezeichnung", field:"ferientyp_kurzbz", visible: false, headerFilter: true},
+					{
+						title:"Mitarbeiterrelevant",
+						field:"mitarbeiterrelevant",
+						visible: false,
+						headerFilter: true,
+						hozAlign: "center",
+						formatter:'tickCross', formatterParams: {
+							tickElement: '<i class="fas fa-check text-success"></i>',
+							crossElement: '<i class="fas fa-times text-danger"></i>'
+						},
+						headerFilter:"tickCross", headerFilterParams: {
+							"tristate":true, elementAttributes:{"value":"true"}
+						},
+						headerFilterEmptyCheck:function(value){return value === null}
+					},
+					{
+						title:"Studierendenrelevant",
+						field:"studierendenrelevant",
+						visible: false,
+						headerFilter: true,
+						hozAlign: "center",
+						formatter:'tickCross', formatterParams: {
+							tickElement: '<i class="fas fa-check text-success"></i>',
+							crossElement: '<i class="fas fa-times text-danger"></i>'
+						},
+						headerFilter:"tickCross", headerFilterParams: {
+							"tristate":true, elementAttributes:{"value":"true"}
+						},
+						headerFilterEmptyCheck:function(value){return value === null}
+					},
+					{
+						title:"Lehre planbar",
+						field:"lehre",
+						visible: false,
+						headerFilter: true,
+						hozAlign: "center",
+						formatter:'tickCross', formatterParams: {
+							tickElement: '<i class="fas fa-check text-success"></i>',
+							crossElement: '<i class="fas fa-times text-danger"></i>'
+						},
+						headerFilter:"tickCross", headerFilterParams: {
+							"tristate":true, elementAttributes:{"value":"true"}
+						},
+						headerFilterEmptyCheck:function(value){return value === null}
+					},
+					{title:"Aktionen", field: "actions",
+						minWidth: 150, // Ensures Action-buttons will be always fully displayed
+						formatter: (cell, formatterParams, onRendered) => {
+							let container = document.createElement('div');
+							container.className = "d-flex gap-2";
+
+							let button = document.createElement('button');
+							button.className = 'btn btn-outline-secondary btn-action';
+							button.innerHTML = '<i class="fa fa-edit"></i>';
+							button.title = this.$p.t('person', 'ferien_edit');
+							button.addEventListener('click', (event) =>
+								this.$refs.modal.open(JSON.parse(JSON.stringify(cell.getData()))) // deep copy
+							);
+							container.append(button);
+
+							button = document.createElement('button');
+							button.className = 'btn btn-outline-secondary';
+							button.innerHTML = '<i class="fa fa-trash"></i>';
+							button.addEventListener('click', evt => {
+								evt.stopPropagation();
+								this.$fhcAlert
+									.confirmDelete()
+									.then(result => result ? cell.getData().ferien_id : Promise.reject({handled:true}))
+									.then(ferien_id => this.$api.call(ApiFerienverwaltung.delete(ferien_id)))
+									.then(() => {
+										//cell.getRow().delete();
+										this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successDelete'));
+										this.reload();
+									})
+									.catch(this.$fhcAlert.handleSystemError);
+							});
+							container.append(button);
+
+							return container;
+						},
+						frozen: true
+					}
+				]
+			},
+			tabulatorEvents: [
+				{
+					event: 'tableBuilt',
+					handler: async () => {
+
+						await this.$p.loadCategory(['global', 'ferien']);
+
+						const setHeader = (field, text) => {
+							const col = this.$refs.table.tabulator.getColumn(field);
+							if (!col) return;
+
+							const el = col.getElement();
+							if (!el || !el.querySelector) return;
+
+							const titleEl = el.querySelector('.tabulator-col-title');
+							if (titleEl) {
+								titleEl.textContent = text;
+							}
+						};
+
+						setHeader('ferien_id', this.$p.t('ferien', 'ferienId'));
+						setHeader('vondatum', this.$p.t('ferien', 'vondatum'));
+						setHeader('bisdatum', this.$p.t('ferien', 'bisdatum'));
+						setHeader('bezeichnung', this.$p.t('global', 'bezeichnung'));
+						setHeader('oe_kurzbz', this.$p.t('ferien', 'oeKurzbezeichnung'));
+						setHeader('oe_bezeichnung', this.$p.t('ferien', 'oeBezeichnung'));
+						setHeader('studienplan_bezeichnung', this.$p.t('global', 'studienplanBezeichnung'));
+						setHeader('ferientyp_kurzbz', this.$p.t('ferien', 'ferientypKurzbz'));
+						setHeader('mitarbeiterrelevant', this.$p.t('ferien', 'mitarbeiterrelevant'));
+						setHeader('studierendenrelevant', this.$p.t('ferien', 'studierendenrelevant'));
+						setHeader('lehre', this.$p.t('ferien', 'lehrePlanbar'));
+						setHeader('actions', this.$p.t('global', 'aktionen'));
+					}
+				}
+			]
+		}
+	},
+	computed: {
+	},
+	methods: {
+		reload() {
+			this.$refs.table.reloadTable();
+		},
+		actionNew() {
+			this.$refs.modal.open();
+		},
+		importFerien() {
+			this.$api
+			.call(ApiFerienverwaltung.importFerien(this.filterVonDatum, this.filterBisDatum))
+			.then(result => {
+					this.$fhcAlert.alertSuccess(this.$p.t('ferien', 'importiert') + ": " + result.data);
+					this.reload();
+				}
+			)
+			.catch(error => {
+				if (error)
+					this.$fhcAlert.handleSystemError(error);
+			});
+		}
+	},
+	created() {
+
+		this.$api
+			.call(ApiFerienverwaltung.getDefaultVonBis())
+			.then(result => {
+					this.filterVonDatum = result.data.defaultVon;
+					this.filterBisDatum = result.data.defaultBis;
+				}
+			)
+			.catch(error => {
+				if (error)
+					this.$fhcAlert.handleSystemError(error);
+			});
+	},
+	template: `
+
+	<core-navigation-cmpt 
+		v-bind:add-side-menu-entries="sideMenuEntries"
+		v-bind:add-header-menu-entries="headerMenuEntries"
+		>
+	</core-navigation-cmpt>
+
+	<div class="h-100 d-flex flex-column">
+		<div class="row">
+			<div class="col-4">
+				<form-input
+					type="DatePicker"
+					v-model="filterVonDatum"
+					name="filtervondatum"
+					:label="$p.t('ferien/vondatum')"
+					:enable-time-picker="false"
+					text-input
+					format="dd.MM.yyyy"
+					auto-apply
+					>
+				</form-input>
+			</div>
+			<div class="col-4">
+				<form-input
+					type="DatePicker"
+					v-model="filterBisDatum"
+					name="filterbisdatum"
+					:label="$p.t('ferien/bisdatum')"
+					:enable-time-picker="false"
+					text-input
+					format="dd.MM.yyyy"
+					auto-apply
+					>
+				</form-input>
+			</div>
+			<div class="col-2 align-self-end">
+				<button
+					class="btn btn-primary"
+					@click="reload()"
+					:disabled="loading"
+					>
+					<i v-if="loading" class="fa fa-spinner fa-spin"></i>
+					{{ $p.t('ui/anzeigen') }}
+				</button>
+			</div>
+			<div class="col-2 align-self-end justify-content-end">
+				<button
+					class="btn btn-secondary"
+					@click="importFerien()"
+					:disabled="loading"
+					>
+					<i v-if="loading" class="fa fa-spinner fa-spin"></i>
+					{{ $p.t('ferien/ferienImportieren') }}
+				</button>
+			</div>
+		</div>
+		<div class="row mt-3">
+			<div class="col">
+				<core-filter-cmpt
+					ref="table"
+					table-only
+					:side-menu="false"
+					:tabulator-options="tabulatorOptions"
+					:tabulator-events="tabulatorEvents"
+					reload
+					:reload-btn-infotext="this.$p.t('table', 'reload')"
+					new-btn-show
+					:new-btn-label="$p.t('ui/neu')"
+					@click:new="actionNew"
+					>
+				</core-filter-cmpt>
+				<ferien-modal ref="modal" @saved="reload"></ferien-modal>
+			</div>
+		</div>
+	</div>`
+};

public/js/components/Ferienverwaltung/Modal.js

@@ -0,0 +1,190 @@
+import BsModal from "../Bootstrap/Modal.js";
+import BsConfirm from "../Bootstrap/Confirm.js";
+import CoreForm from "../Form/Form.js";
+import FormValidation from "../Form/Validation.js";
+import FormInput from "../Form/Input.js";
+
+import ApiFerien from '../../api/factory/ferienverwaltung/ferienverwaltung.js';
+
+export default {
+	components: {
+		BsModal,
+		CoreForm,
+		FormValidation,
+		FormInput
+	},
+	data() {
+		return {
+			oeList: [],
+			studienplaeneList: [],
+			ferientypList: [],
+			loading: false,
+			data: {},
+		};
+	},
+	computed: {
+	},
+	methods: {
+		save() {
+			this.$refs.form.clearValidation();
+			this.loading = true;
+
+			let saveFunc = this.data.ferien_id ? ApiFerien.update : ApiFerien.insert;
+
+			this.$refs.form
+				.call(saveFunc(this.data))
+				.then(result => {
+					this.$emit('saved', result.data);
+					this.loading = false;
+					this.$refs.modal.hide();
+					this.$fhcAlert.alertSuccess(this.$p.t('ui/gespeichert'));
+				})
+				.catch(error => {
+					if (error)
+						this.$fhcAlert.handleSystemError(error);
+					this.loading = false;
+				});
+		},
+		open(data) {
+			this.$refs.form.clearValidation();
+			this.data = data ?? {
+				oe_kurzbz: null,
+				bezeichnung: '',
+				vondatum: null,
+				bisdatum: null,
+				studienplan_id: null
+			};
+
+			this.$api
+			.call(ApiFerien.getOe())
+			.then(result => {
+					this.oeList = result.data;
+					//this.loading = false;
+				}
+			)
+			.catch(error => {
+				if (error)
+					this.$fhcAlert.handleSystemError(error);
+				//this.loading = false;
+			});
+
+
+			this.getStudienplaene();
+
+			this.$api
+			.call(ApiFerien.getFerientypen())
+			.then(result => {
+					this.ferientypList = result.data;
+				}
+			)
+			.catch(error => {
+				if (error)
+					this.$fhcAlert.handleSystemError(error);
+			});
+
+			this.$refs.modal.show();
+		},
+		getStudienplaene() {
+			if (!this.data.oe_kurzbz) return;
+
+			this.$api
+			.call(ApiFerien.getStudienplaene(this.data.oe_kurzbz, this.data.vondatum, this.data.bisdatum))
+			.then(result => {
+					this.studienplaeneList = result.data;
+				}
+			)
+			.catch(error => {
+				if (error)
+					this.$fhcAlert.handleSystemError(error);
+			});
+		},
+		preventCloseOnLoading(ev) {
+			if (this.loading)
+				ev.returnValue = false;
+		}
+	},
+	template: `
+	<core-form ref="form" class="stv-details-ferien-edit" @submit.prevent="save">
+		<bs-modal ref="modal" @hide-bs-modal="preventCloseOnLoading">
+			<form-validation></form-validation>
+
+			<fieldset :disabled="loading">
+				<form-input
+					type="DatePicker"
+					v-model="data.vondatum"
+					name="vondatum"
+					:label="$p.t('ferien/vondatum')"
+					:enable-time-picker="false"
+					text-input
+					format="dd.MM.yyyy"
+					auto-apply
+					>
+				</form-input>
+
+				<form-input
+					type="DatePicker"
+					v-model="data.bisdatum"
+					name="bisdatum"
+					:label="$p.t('ferien/bisdatum')"
+					:enable-time-picker="false"
+					text-input
+					format="dd.MM.yyyy"
+					auto-apply
+					>
+				</form-input>
+
+				<form-input
+					v-model="data.bezeichnung"
+					name="bezeichnung"
+					:label="$p.t('global/bezeichnung')"
+					>
+				</form-input>
+
+				<form-input
+					type="select"
+					v-model="data.oe_kurzbz"
+					name="oe_kurzbz"
+					:label="$p.t('ferien/organisationseinheit')"
+					@change="getStudienplaene"
+					>
+					<option :value="null">-- {{ $p.t('ui/alle') }} --</option>
+					<option v-for="oe in oeList" :key="oe.oe_kurzbz" :value="oe.oe_kurzbz">
+						{{ oe.organisationseinheittyp_kurzbz + ' ' + oe.bezeichnung }}
+					</option>
+				</form-input>
+
+				<form-input
+					type="select"
+					v-model="data.studienplan_id"
+					name="studienplan_id"
+					:label="$p.t('ferien/studienplan')"
+					>
+					<option :value="null">-- {{ $p.t('ui/keineAuswahl') }} --</option>
+					<option v-for="studienplan in studienplaeneList" :key="studienplan.studienplan_id" :value="studienplan.studienplan_id">
+						{{ studienplan.bezeichnung }}
+					</option>
+				</form-input>
+
+				<form-input
+					type="select"
+					v-model="data.ferientyp_kurzbz"
+					name="ferientyp_kurzbz"
+					:label="$p.t('ferien/ferientypKurzbz')"
+					>
+					<option :value="null">-- {{ $p.t('ui/keineAuswahl') }} --</option>
+					<option v-for="ferientyp in ferientypList" :key="ferientyp.ferientyp_kurzbz" :value="ferientyp.ferientyp_kurzbz">
+						{{ ferientyp.ferientyp_kurzbz }}
+					</option>
+				</form-input>
+
+			</fieldset>
+
+			<template #footer>
+				<button type="submit" class="btn btn-primary" :disabled="loading">
+					<i v-if="loading" class="fa fa-spinner fa-spin"></i>
+					{{ $p.t('ui/speichern') }}
+				</button>
+			</template>
+		</bs-modal>
+	</core-form>`
+};

system/dbupdate_3.4.php

@@ -102,6 +102,8 @@ require_once('dbupdate_3.4/75959_StudVw_Automatische_Tags.php');
 require_once('dbupdate_3.4/76160_lvv_favorites.php');
 require_once('dbupdate_3.4/77080_tabulator_presets_table.php');
 require_once('dbupdate_3.4/78292_gehaltsanpassungtyp.php');
+require_once('dbupdate_3.4/54225_reihungstest_ablauf_fuer_quereinsteiger.php');
+require_once('dbupdate_3.4/71405_ferienzeiten.php');
 
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';
@@ -253,7 +255,7 @@ $tabellen=array(
 	"hr.tbl_lohnguide_modellfunktion" => array("modellfunktion_kurzbz", "bezeichnung", "jobfamilie_kurzbz", "aktiv", "sort", "insertvon", "insertamum", "updatevon", "updateamum"),
 	"hr.tbl_lohnguide_modellstelle" => array("modellstelle_kurzbz", "bezeichnung", "grade", "modellfunktion_kurzbz", "aktiv", "sort", "insertvon", "insertamum", "updatevon", "updateamum"),
 	"hr.tbl_lohnguide_fachrichtung" => array("fachrichtung_kurzbz", "bezeichnung", "aktiv", "insertvon", "insertamum", "updatevon", "updateamum"),
-	"hr.tbl_vertragsbestandteil_lohnguide" => array("vertragsbestandteil_id", "stellenbezeichnung", "vordienstzeit", "fachrichtung_kurzbz", "modellstelle_kurzbz", "kommentar_person", "kommentar_modellstelle"),	
+	"hr.tbl_vertragsbestandteil_lohnguide" => array("vertragsbestandteil_id", "stellenbezeichnung", "vordienstzeit", "fachrichtung_kurzbz", "modellstelle_kurzbz", "kommentar_person", "kommentar_modellstelle"),
 	"lehre.tbl_abschlussbeurteilung"  => array("abschlussbeurteilung_kurzbz","bezeichnung","bezeichnung_english","sort"),
 	"lehre.tbl_abschlusspruefung"  => array("abschlusspruefung_id","student_uid","vorsitz","pruefer1","pruefer2","pruefer3","abschlussbeurteilung_kurzbz","akadgrad_id","pruefungstyp_kurzbz","datum","uhrzeit","sponsion","anmerkung","updateamum","updatevon","insertamum","insertvon","ext_id","note","protokoll","endezeit","pruefungsantritt_kurzbz","freigabedatum"),
 	"lehre.tbl_abschlusspruefung_antritt"  => array("pruefungsantritt_kurzbz","bezeichnung","bezeichnung_english","sort"),
@@ -264,7 +266,7 @@ $tabellen=array(
 	"lehre.tbl_anrechnung_begruendung"  => array("begruendung_id","bezeichnung"),
 	"lehre.tbl_anrechnungszeitraum"  => array("anrechnungszeitraum_id","studiensemester_kurzbz","anrechnungstart","anrechnungende", "insertamum", "insertvon"),
 	"lehre.tbl_betreuerart"  => array("betreuerart_kurzbz","beschreibung","aktiv"),
-	"lehre.tbl_ferien"  => array("bezeichnung","studiengang_kz","vondatum","bisdatum"),
+	"lehre.tbl_ferien"  => array("ferien_id","bezeichnung","studiengang_kz","vondatum","bisdatum","oe_kurzbz","studienplan_id","ferientyp_kurzbz","insertamum","insertvon","updateamum","updatevon"),
 	"lehre.tbl_lehreinheit"  => array("lehreinheit_id","lehrveranstaltung_id","studiensemester_kurzbz","lehrfach_id","lehrform_kurzbz","stundenblockung","wochenrythmus","start_kw","raumtyp","raumtypalternativ","sprache","lehre","anmerkung","unr","lvnr","updateamum","updatevon","insertamum","insertvon","ext_id","lehrfach_id_old","gewicht"),
 	"lehre.tbl_lehreinheitgruppe"  => array("lehreinheitgruppe_id","lehreinheit_id","studiengang_kz","semester","verband","gruppe","gruppe_kurzbz","updateamum","updatevon","insertamum","insertvon","ext_id"),
 	"lehre.tbl_lehreinheitmitarbeiter"  => array("lehreinheit_id","mitarbeiter_uid","lehrfunktion_kurzbz","semesterstunden","planstunden","stundensatz","faktor","anmerkung","bismelden","updateamum","updatevon","insertamum","insertvon","ext_id","standort_id","vertrag_id"),
@@ -421,6 +423,7 @@ $tabellen=array(
 	"testtool.tbl_pruefling_frage"  => array("prueflingfrage_id","pruefling_id","frage_id","nummer","begintime","endtime"),
 	"testtool.tbl_frage_sprache"  => array("frage_id","sprache","text","bild","audio","insertamum","insertvon","updateamum","updatevon"),
 	"testtool.tbl_vorschlag_sprache"  => array("vorschlag_id","sprache","text","bild","audio","insertamum","insertvon","updateamum","updatevon"),
+	"testtool.tbl_pruefling_gebiet"  => array("prueflinggebiet_id","pruefling_id","gebiet_id","insertamum"),
 	"system.tbl_app" => array("app"),
 	"system.tbl_appdaten" => array("appdaten_id","uid","app","appversion","version","bezeichnung","daten","freigabe","insertamum","insertvon","updateamum","updatevon"),
 	"system.tbl_cronjob"  => array("cronjob_id","server_kurzbz","titel","beschreibung","file","last_execute","aktiv","running","jahr","monat","tag","wochentag","stunde","minute","standalone","reihenfolge","updateamum", "updatevon","insertamum","insertvon","variablen"),

system/dbupdate_3.4/54225_reihungstest_ablauf_fuer_quereinsteiger.php

@@ -0,0 +1,41 @@
+<?php
+if (! defined('DB_NAME')) exit('No direct script access allowed');
+
+// Creates table public.tbl_notiz_typ if it doesn't exist and grants privileges
+if (!$result = @$db->db_query('SELECT 1 FROM testtool.tbl_pruefling_gebiet LIMIT 1'))
+{
+	$qry = 'CREATE TABLE testtool.tbl_pruefling_gebiet
+			(
+				prueflinggebiet_id integer NOT NULL,
+				pruefling_id integer NOT NULL,
+				gebiet_id integer NOT NULL,
+				insertamum timestamp DEFAULT now()
+			);
+			
+			ALTER TABLE testtool.tbl_pruefling_gebiet OWNER TO fhcomplete;
+			ALTER TABLE testtool.tbl_pruefling_gebiet ADD CONSTRAINT pk_tbl_pruefling_gebiet PRIMARY KEY (prueflinggebiet_id);
+			ALTER TABLE testtool.tbl_pruefling_gebiet ADD CONSTRAINT fk_tbl_pruefling_gebiet_pruefling_id FOREIGN KEY (pruefling_id) REFERENCES testtool.tbl_pruefling(pruefling_id) ON UPDATE CASCADE ON DELETE RESTRICT;
+			ALTER TABLE testtool.tbl_pruefling_gebiet ADD CONSTRAINT fk_tbl_pruefling_gebiet_gebiet_id FOREIGN KEY (gebiet_id) REFERENCES testtool.tbl_gebiet(gebiet_id) ON UPDATE CASCADE ON DELETE RESTRICT;
+
+			CREATE SEQUENCE testtool.tbl_pruefling_gebiet_prueflinggebiet_id_seq
+				START WITH 1
+				INCREMENT BY 1
+				NO MINVALUE
+				NO MAXVALUE
+				CACHE 1;
+
+			ALTER TABLE testtool.tbl_pruefling_gebiet_prueflinggebiet_id_seq OWNER TO fhcomplete;
+			ALTER TABLE testtool.tbl_pruefling_gebiet ALTER COLUMN prueflinggebiet_id SET DEFAULT nextval(\'testtool.tbl_pruefling_gebiet_prueflinggebiet_id_seq\');
+
+			GRANT SELECT, UPDATE, INSERT, DELETE ON testtool.tbl_pruefling_gebiet TO web;
+			GRANT SELECT, UPDATE, INSERT, DELETE ON testtool.tbl_pruefling_gebiet TO vilesci;
+			GRANT SELECT, UPDATE ON testtool.tbl_pruefling_gebiet_prueflinggebiet_id_seq TO vilesci;
+			GRANT SELECT, UPDATE ON testtool.tbl_pruefling_gebiet_prueflinggebiet_id_seq TO web;
+			';
+
+	if (!$db->db_query($qry))
+		echo '<strong>public.tbl_pruefling_gebiet: '.$db->db_last_error().'</strong><br>';
+	else
+		echo '<br>public.tbl_pruefling_gebiet table created';
+}
+

system/dbupdate_3.4/71405_ferienzeiten.php

@@ -0,0 +1,220 @@
+<?php
+if (! defined('DB_NAME')) exit('No direct script access allowed');
+
+//Add column ferien_id to lehre.tbl_ferien
+if(!@$db->db_query("SELECT ferien_id FROM lehre.tbl_ferien LIMIT 1"))
+{
+	$qry = 'ALTER TABLE lehre.tbl_ferien ADD COLUMN ferien_id integer;';
+
+	if(!$db->db_query($qry))
+		echo '<strong> lehre.tbl_ferien '.$db->db_last_error().'</strong><br>';
+	else
+		echo '<br>lehre.tbl_ferien: Neue Spalte ferien_id hinzugefügt';
+}
+
+//Column ferien_id mit Werten befüllen
+if($result = @$db->db_query("SELECT ferien_id FROM lehre.tbl_ferien where ferien_id is not null LIMIT 1"))
+{
+	if ($db->db_num_rows($result) == 0)
+	{
+		$qry = 'UPDATE lehre.tbl_ferien et SET ferien_id =
+		(SELECT rownumber FROM (SELECT ROW_NUMBER() OVER (ORDER BY bezeichnung, studiengang_kz)
+			AS rownumber, t.* FROM lehre.tbl_ferien t ORDER BY bezeichnung, studiengang_kz) rn
+			WHERE rn.bezeichnung = et.bezeichnung
+			AND rn.studiengang_kz = et.studiengang_kz);
+			';
+
+		if(!$db->db_query($qry))
+			echo '<strong> lehre.tbl_ferien '.$db->db_last_error().'</strong><br>';
+		else
+			echo '<br>lehre.tbl_ferien: Spalte bis.tbl_ferien_id mit Werten aufgefüllt';
+	}
+}
+
+//Create Sequence lehre.tbl_ferien and grant Rights
+if ($result = @$db->db_query("SELECT * FROM pg_class WHERE relname = 'tbl_ferien_ferien_id_seq'"))
+{
+	if ($db->db_num_rows($result) == 0)
+	{
+		if ($count = @$db->db_query("SELECT * FROM lehre.tbl_ferien"))
+		{
+			$count = $db->db_num_rows($count) + 1;
+			$qry = 'CREATE SEQUENCE lehre.tbl_ferien_ferien_id_seq START ';
+			$qry .= $count;
+			if(!$db->db_query($qry))
+			{
+				echo '<strong> lehre.tbl_ferien '.$db->db_last_error().'</strong><br>';
+			}
+			else
+			{
+				echo '<br>lehre.tbl_ferien: Sequence lehre.tbl_ferien_ferien_id_seq mit Startwert ' . $count . ' erstellt';
+				$qry2 = "GRANT SELECT, UPDATE ON lehre.tbl_ferien_ferien_id_seq TO vilesci;
+						GRANT SELECT, UPDATE ON lehre.tbl_ferien_ferien_id_seq TO web;";
+				if(!$db->db_query($qry2))
+				{
+					echo '<strong>lehre.tbl_ferien_ferien_id_seq Berechtigungen: '.$db->db_last_error().'</strong><br>';
+				}
+				else
+				{
+					echo '<br>lehre.tbl_ferien: Rechte auf lehre.tbl_ferien_ferien_id_seq fuer web user und vilesci gesetzt ';
+				}
+			}
+
+		}
+	}
+}
+
+//lehre.tbl_ferien auf NOT NULL setzen
+if ($result = @$db->db_query("SELECT is_nullable FROM INFORMATION_SCHEMA.COLUMNS WHERE table_name = 'tbl_ferien' AND column_name = 'ferien_id' and is_nullable = 'NO'"))
+{
+	if($db->db_num_rows($result)==0)
+	{
+		$qry = 'ALTER TABLE lehre.tbl_ferien ALTER COLUMN ferien_id SET NOT NULL';
+
+		if(!$db->db_query($qry))
+		echo '<strong> lehre.tbl_ferien '.$db->db_last_error().'</strong><br>';
+			else
+		echo '<br>lehre.tbl_ferien: Spalte bis.tbl_ferien_id auf NOT NULL gesetzt';
+	}
+}
+
+//lehre.tbl_ferien DEFAULT einstellen
+if ($result = @$db->db_query("SELECT column_default FROM INFORMATION_SCHEMA.COLUMNS WHERE table_name = 'tbl_ferien' AND column_name = 'ferien_id' and column_default is null"))
+{
+	if($db->db_num_rows($result)==1)
+	{
+		$qry = "ALTER TABLE lehre.tbl_ferien ALTER COLUMN ferien_id SET DEFAULT nextval('lehre.tbl_ferien_ferien_id_seq'::regclass);";
+
+		if(!$db->db_query($qry))
+			echo '<strong> lehre.tbl_ferien '.$db->db_last_error().'</strong><br>';
+		else
+			echo '<br> lehre.tbl_ferien: Defaultwert bei Spalte bis.tbl_ferien_id gesetzt';
+	}
+}
+
+//DELETE Constraint PRIMARY KEY pk_tbl_ferien (bezeichnung, studiengang_kz) entfernen
+if ($result = @$db->db_query("SELECT conname FROM pg_constraint WHERE conname = 'pk_tbl_ferien'"))
+{
+	if($db->db_num_rows($result)==1)
+	{
+		$qry = "ALTER TABLE lehre.tbl_ferien DROP CONSTRAINT pk_tbl_ferien;";
+
+		if (!$db->db_query($qry))
+			echo '<strong>lehre.tbl_ferien: '.$db->db_last_error().'</strong><br>';
+		else
+			echo '<br>lehre.tbl_ferien: Primary Key pk_tbl_ferien (bezeichnung, studiengang_kz) entfernt ';
+	}
+}
+
+// ADD PRIMARY KEY tbl_ferien_pk to lehre.tbl_ferien
+if ($result = @$db->db_query("SELECT conname FROM pg_constraint WHERE conname = 'tbl_ferien_pk'"))
+{
+	if ($db->db_num_rows($result) == 0)
+	{
+		$qry = "ALTER TABLE lehre.tbl_ferien ADD CONSTRAINT tbl_ferien_pk PRIMARY KEY(ferien_id);";
+
+		if (!$db->db_query($qry))
+			echo '<strong>slehre.tbl_ferien: '.$db->db_last_error().'</strong><br>';
+		else
+			echo '<br>lehre.tbl_ferien: Primary Key tbl_ferien_pk (ferien_id) hinzugefügt';
+	}
+}
+
+// add new fields to tbl_ferien, migrate data (add oe_kurzbz data), mark studiengang_kz as deprecated
+if(!$result = @$db->db_query("SELECT oe_kurzbz FROM lehre.tbl_ferien LIMIT 1"))
+{
+	$qry = "ALTER TABLE lehre.tbl_ferien
+			ADD COLUMN IF NOT EXISTS oe_kurzbz VARCHAR(32),
+			ADD COLUMN IF NOT EXISTS studienplan_id SMALLINT DEFAULT NULL,
+			ADD CONSTRAINT tbl_ferien_studienplan_fk
+				FOREIGN KEY (studienplan_id)
+				REFERENCES lehre.tbl_studienplan(studienplan_id)
+				ON UPDATE CASCADE ON DELETE RESTRICT,
+			ADD CONSTRAINT tbl_ferien_oe_kurzbz_fk
+				FOREIGN KEY (oe_kurzbz)
+				REFERENCES public.tbl_organisationseinheit(oe_kurzbz)
+				ON UPDATE CASCADE ON DELETE RESTRICT,
+			ADD COLUMN IF NOT EXISTS insertamum timestamp DEFAULT NOW(),
+			ADD COLUMN IF NOT EXISTS insertvon VARCHAR(32),
+			ADD COLUMN IF NOT EXISTS updateamum timestamp,
+			ADD COLUMN IF NOT EXISTS updatevon VARCHAR(32);
+			UPDATE lehre.tbl_ferien
+			SET oe_kurzbz = (
+				SELECT
+					CASE
+						WHEN studiengang_kz = 0
+						THEN NULL
+						ELSE oe_kurzbz
+					END
+				FROM
+					public.tbl_studiengang
+				WHERE
+					studiengang_kz = tbl_ferien.studiengang_kz
+			)
+			WHERE oe_kurzbz IS NULL AND studiengang_kz IS NOT NULL;
+			ALTER TABLE lehre.tbl_ferien ALTER COLUMN studiengang_kz DROP NOT NULL;
+			COMMENT ON COLUMN lehre.tbl_ferien.studiengang_kz IS 'DEPRECATED';";
+
+	if(!$db->db_query($qry))
+		echo '<strong>lehre.tbl_ferien: '.$db->db_last_error().'</strong><br>';
+	else
+		echo '<br>lehre.tbl_ferien columns oe_kurzbz, studienplan_id, insertamum, insertvon, updateamum, updatevon hinzugefuegt';
+}
+
+// Creates table lehre.tbl_ferientyp if it doesn't exist and grants privileges
+if (!$result = @$db->db_query('SELECT 0 FROM lehre.tbl_ferientyp WHERE 0 = 1'))
+{
+	$qry = 'CREATE TABLE lehre.tbl_ferientyp (
+				ferientyp_kurzbz VARCHAR(64),
+				beschreibung VARCHAR(256) NOT NULL,
+				mitarbeiter boolean NOT NULL,
+				studierende boolean NOT NULL,
+				lehre boolean NOT NULL
+			);
+
+			COMMENT ON TABLE lehre.tbl_ferientyp IS \'Typ-Tabelle zum Speichern von Informationen zu Ferien.\';
+			COMMENT ON COLUMN lehre.tbl_ferientyp.ferientyp_kurzbz IS \'Typ der Ferien.\';
+			COMMENT ON COLUMN lehre.tbl_ferientyp.mitarbeiter IS \'Ob die Ferien für MitarbeiterInnen relevant sind.\';
+			COMMENT ON COLUMN lehre.tbl_ferientyp.studierende IS \'Ob die Ferien für Studierende relevant sind.\';
+			COMMENT ON COLUMN lehre.tbl_ferientyp.lehre IS \'Ob Lehre in den Ferien verplant werden kann.\';
+
+			ALTER TABLE lehre.tbl_ferientyp ADD CONSTRAINT pk_tbl_ferientyp PRIMARY KEY (ferientyp_kurzbz);
+
+			ALTER TABLE lehre.tbl_ferien ADD COLUMN IF NOT EXISTS ferientyp_kurzbz VARCHAR(64) DEFAULT NULL;
+
+			ALTER TABLE lehre.tbl_ferien ADD CONSTRAINT tbl_lehre_ferien_ferientyp_kurzbz_fk FOREIGN KEY (ferientyp_kurzbz)
+			REFERENCES lehre.tbl_ferientyp (ferientyp_kurzbz) MATCH FULL
+			ON DELETE SET NULL ON UPDATE CASCADE;
+			INSERT INTO lehre.tbl_ferientyp (ferientyp_kurzbz, beschreibung, mitarbeiter, studierende, lehre)
+			VALUES(\'Feiertag\', \'Gesetzliche und andere Feiertage\', true, true, false);
+			INSERT INTO lehre.tbl_ferientyp (ferientyp_kurzbz, beschreibung, mitarbeiter, studierende, lehre)
+			VALUES(\'Ferien\', \'Ferientage\', true, true, false);
+			INSERT INTO lehre.tbl_ferientyp (ferientyp_kurzbz, beschreibung, mitarbeiter, studierende, lehre)
+			VALUES(\'Info\', \'Weitere Zeiten für Ereignisse, z.B. Sportwoche, Ausgleichswoche... \', true, true, false);
+	';
+
+	if (!$db->db_query($qry))
+		echo '<strong>lehre.tbl_ferientyp: '.$db->db_last_error().'</strong><br>';
+	else
+		echo '<br>lehre.tbl_ferientyp table created';
+
+	$qry = 'GRANT SELECT, UPDATE, INSERT, DELETE ON TABLE lehre.tbl_ferientyp TO vilesci;';
+	if (!$db->db_query($qry))
+		echo '<strong>lehre.tbl_ferientyp: '.$db->db_last_error().'</strong><br>';
+	else
+		echo '<br>Granted privileges to <strong>vilesci</strong> on lehre.tbl_ferientyp';
+}
+
+// Add UNIQUE constraint on fehlercode and fehler_kurzbz on system.tbl_fehler
+if ($result = @$db->db_query("SELECT conname FROM pg_constraint WHERE conname = 'uk_tbl_ferien_vondatum_bisdatum_oe_bezeichnung'"))
+{
+	if ($db->db_num_rows($result) == 0)
+	{
+		$qry = "ALTER TABLE lehre.tbl_ferien ADD CONSTRAINT uk_tbl_ferien_vondatum_bisdatum_oe_bezeichnung UNIQUE (vondatum, bisdatum, oe_kurzbz, bezeichnung);";
+
+		if (!$db->db_query($qry))
+			echo '<strong>lehre.tbl_ferien '.$db->db_last_error().'</strong><br>';
+		else
+			echo '<br>added UNIQUE constraint on "vondatum", "bisdatum" and "bezeichnung" for lehre.tbl_ferien<br>';
+	}
+}

system/phrasesupdate.php

@@ -19829,6 +19829,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'international',
+		'category' => 'international',
+		'phrase' => 'massnahmeneinmalig',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Diese Maßnahme ist nur einmalig planbar.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'This measure may only be planned once.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'international',
 		'category' => 'international',
@@ -20609,6 +20629,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'international',
+		'category' => 'international',
+		'phrase' => 'personenMassnahmen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'alle Maßnahmen der Personen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => ' all measures of the people',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'international',
 		'category' => 'international',
@@ -20689,6 +20729,46 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'international',
+		'category' => 'international',
+		'phrase' => 'einmalig',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Nur einmal planbar',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'One-time only',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'international',
+		'category' => 'international',
+		'phrase' => 'erroreinmalig',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Diese Maßnahme kann nur einmal geplant werden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'This measure can only be planned once.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'gruppenmanagement',
@@ -62491,8 +62571,390 @@ I have been informed that I am under no obligation to consent to the transmissio
 				'insertvon' => 'system'
 			)
 		)
-	)
+	),
 	// ### Infocenter Onboarding END
+	// ### Ferien START
+	array(
+		'app' => 'core',
+		'category' => 'ferien',
+		'phrase' => 'ferienId',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Ferien Id',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Holiday Id',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ferien',
+		'phrase' => 'vondatum',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Datum von',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'From date',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ferien',
+		'phrase' => 'bisdatum',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Datum bis',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'To date',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ferien',
+		'phrase' => 'organisationseinheit',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Organisationseinheit",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Organisational unit",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ferien',
+		'phrase' => 'oeKurzbezeichnung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Organisationseinheit Kurzbezeichung",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Organisational unit short name",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ferien',
+		'phrase' => 'oeBezeichnung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Organisationseinheit Bezeichnung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Organizational unit name',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ferien',
+		'phrase' => 'studienplan',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Studienplan',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Study plan',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ferien',
+		'phrase' => 'studienplanBezeichnung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Studienplan Bezeichnung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Study plan name',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ferien',
+		'phrase' => 'ferientypKurzbz',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Ferientyp Bezeichnung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Holiday type name',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ferien',
+		'phrase' => 'mitarbeiterrelevant',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Mitarbeiterrelevant',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Employee relevant',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ferien',
+		'phrase' => 'studierendenrelevant',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Studierendenrelevant',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Student relevant',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ferien',
+		'phrase' => 'lehrePlanbar',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Lehre planbar',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Classes assignable',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ferien',
+		'phrase' => 'ferien_edit',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'edit holidays',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Ferien bearbeiten',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'keineAuswahl',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'keine Auswahl',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'no selection',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ferien',
+		'phrase' => 'csvNichtGelesen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'CSV nicht gelesen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'CSV could not be read',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ferien',
+		'phrase' => 'fehlerBeimLaden',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fehler beim Laden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error when loading',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ferien',
+		'phrase' => 'fehlerBeimHinzufuegen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fehler beim Hinzufügen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error when adding',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ferien',
+		'phrase' => 'ferienImportieren',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Ferientage importieren',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Import holidays',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ferien',
+		'phrase' => 'importiert',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Importiert',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Imported',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	)
+	// ### Ferien END
 );
 
 

vilesci/lehre/ferienverwaltung.php

@@ -125,11 +125,13 @@
 		}
 		else
 		{
-			$sql_query="INSERT INTO lehre.tbl_ferien (studiengang_kz, bezeichnung, vondatum, bisdatum) VALUES(
+			$sql_query="INSERT INTO lehre.tbl_ferien (studiengang_kz, bezeichnung, vondatum, bisdatum, oe_kurzbz) VALUES(
 			".$db->db_add_param($_POST['studiengang_kz'], FHC_INTEGER).",
 			".$db->db_add_param($_POST['bezeichnung']).",
 			".$db->db_add_param($datum_obj->formatDatum($_POST['vondatum'],'Y-m-d')).",
-			".$db->db_add_param($datum_obj->formatDatum($_POST['bisdatum'],'Y-m-d')).");";
+			".$db->db_add_param($datum_obj->formatDatum($_POST['bisdatum'],'Y-m-d')).",
+			CASE WHEN ".$db->db_add_param($_POST['studiengang_kz'], FHC_INTEGER)." = 0 THEN NULL
+			ELSE (SELECT oe_kurzbz FROM public.tbl_studiengang WHERE studiengang_kz = ".$db->db_add_param($_POST['studiengang_kz'], FHC_INTEGER).") END);";
 			//echo $sql_query;
 			$db->db_query($sql_query);
 			$stg_kz = $_POST['studiengang_kz'];
@@ -251,7 +253,7 @@
 			{
 				echo '
 					<tr>
-						<td>'.$db->convert_html_chars($stg_arr[$row->studiengang_kz]).'</td>
+						<td>'.$db->convert_html_chars($stg_arr[$row->studiengang_kz] ?? '').'</td>
 						<td>'.$db->convert_html_chars($row->vondatum).'</td>
 						<td>'.$db->convert_html_chars($row->bisdatum).'</td>
 						<td>'.$db->convert_html_chars($row->bezeichnung).'</td>';

vilesci/stammdaten/auswertung_fhtw.php

@@ -251,6 +251,31 @@ if ($deleteSingleResult)
 			exit();
 		}
 
+		$qry = "SELECT * FROM testtool.tbl_pruefling_gebiet
+				WHERE pruefling_id=" . $db->db_add_param($pruefling->pruefling_id) . " AND gebiet_id=" . $db->db_add_param($_POST['gebiet_id']) . "";
+
+		if ($db->db_query($qry))
+		{
+			while ($row = $db->db_fetch_object())
+			{
+				$undo .= " INSERT INTO testtool.tbl_pruefling_gebiet(prueflinggebiet_id,pruefling_id,gebiet_id, insertamum) VALUES (" .
+					$db->db_add_param($row->prueflinggebiet_id, FHC_INTEGER) . ', ' .
+					$db->db_add_param($row->pruefling_id, FHC_INTEGER) . ', ' .
+					$db->db_add_param($row->gebiet_id, FHC_INTEGER) . ', ' .
+					$db->db_add_param($row->insertamum) . ');';
+			}
+		}
+		else
+		{
+			$db->db_query('ROLLBACK');
+			echo json_encode(array(
+				'status' => 'fehler',
+				'msg' => 'Fehler beim Erstellen des UNDO Befehls fuer testtool.tbl_pruefling_gebiet'
+			));
+			exit();
+		}
+
+
 		//Antworten loeschen
 		$qry = "DELETE FROM testtool.tbl_pruefling_frage where pruefling_id=" . $db->db_add_param($pruefling->pruefling_id, FHC_INTEGER) . " AND
 				frage_id IN (SELECT frage_id FROM testtool.tbl_frage WHERE gebiet_id=" . $db->db_add_param($_POST['gebiet_id']) . ");
@@ -258,7 +283,9 @@ if ($deleteSingleResult)
 				DELETE FROM testtool.tbl_antwort
 				WHERE pruefling_id=" . $db->db_add_param($pruefling->pruefling_id) . " AND
 				vorschlag_id IN (SELECT vorschlag_id FROM testtool.tbl_vorschlag WHERE frage_id IN
-				(SELECT frage_id FROM testtool.tbl_frage WHERE gebiet_id=" . $db->db_add_param($_POST['gebiet_id']) . "));";
+				(SELECT frage_id FROM testtool.tbl_frage WHERE gebiet_id=" . $db->db_add_param($_POST['gebiet_id']) . "));
+				
+				DELETE FROM testtool.tbl_pruefling_gebiet where pruefling_id=" . $db->db_add_param($pruefling->pruefling_id, FHC_INTEGER) . " AND gebiet_id=" . $db->db_add_param($_POST['gebiet_id']) . ";";
 
 		if ($result = $db->db_query($qry))
 		{
@@ -388,9 +415,35 @@ if ($deleteAllResults)
 			exit();
 		}
 
+		$qry = "SELECT * FROM testtool.tbl_pruefling_gebiet WHERE pruefling_id=" . $db->db_add_param($pruefling->pruefling_id, FHC_INTEGER) . ";
+				";
+
+		if ($db->db_query($qry))
+		{
+			while ($row = $db->db_fetch_object())
+			{
+				$undo .= " INSERT INTO testtool.tbl_pruefling_gebiet(prueflinggebiet_id,pruefling_id,gebiet_id,insertamum) VALUES (" .
+					$db->db_add_param($row->prueflinggebiet_id, FHC_INTEGER) . ', ' .
+					$db->db_add_param($row->pruefling_id, FHC_INTEGER) . ', ' .
+					$db->db_add_param($row->gebiet_id, FHC_INTEGER) . ', ' .
+					$db->db_add_param($row->insertamum) . ');';
+			}
+		}
+		else
+		{
+			$db->db_query('ROLLBACK');
+			echo json_encode(array(
+				'status' => 'fehler',
+				'msg' => 'Fehler beim Erstellen des UNDO Befehls fuer testtool.tbl_pruefling_gebiet'
+			));
+			exit();
+		}
+
+
 		//Antworten loeschen
 		$qry = "	DELETE FROM testtool.tbl_pruefling_frage where pruefling_id=".$db->db_add_param($pruefling->pruefling_id).";
-					DELETE FROM testtool.tbl_antwort WHERE pruefling_id=".$db->db_add_param($pruefling->pruefling_id).";";
+					DELETE FROM testtool.tbl_antwort where pruefling_id=".$db->db_add_param($pruefling->pruefling_id).";
+					DELETE FROM testtool.tbl_pruefling_gebiet WHERE pruefling_id=".$db->db_add_param($pruefling->pruefling_id).";";
 
 		if ($result = $db->db_query($qry))
 		{

vilesci/stammdaten/reihungstest_administration.php

@@ -402,7 +402,10 @@ if(isset($_POST['deleteteilgebiet']))
 				DELETE FROM testtool.tbl_antwort
 				WHERE pruefling_id=".$db->db_add_param($pruefling->pruefling_id)." AND
 				vorschlag_id IN (SELECT vorschlag_id FROM testtool.tbl_vorschlag WHERE frage_id IN
-				(SELECT frage_id FROM testtool.tbl_frage WHERE gebiet_id=".$db->db_add_param($_POST['gebiet'])."));";
+				(SELECT frage_id FROM testtool.tbl_frage WHERE gebiet_id=".$db->db_add_param($_POST['gebiet'])."));
+				
+				DELETE FROM testtool.tbl_pruefling_gebiet
+				WHERE pruefling_id=".$db->db_add_param($pruefling->pruefling_id)." AND gebiet_id=".$db->db_add_param($_POST['gebiet']).";";
 
 		if($result = $db->db_query($qry))
 		{
@@ -497,7 +500,8 @@ if(isset($_POST['delete_all']))
 		}
 		//Gebiet loeschen
 		$qry = "DELETE FROM testtool.tbl_pruefling_frage where pruefling_id=".$db->db_add_param($pruefling->pruefling_id).";
-				DELETE FROM testtool.tbl_antwort WHERE pruefling_id=".$db->db_add_param($pruefling->pruefling_id).";";
+				DELETE FROM testtool.tbl_antwort WHERE pruefling_id=".$db->db_add_param($pruefling->pruefling_id).";
+				DELETE FROM testtool.tbl_pruefling_gebiet WHERE pruefling_id=".$db->db_add_param($pruefling->pruefling_id).";";
 
 		if($result = $db->db_query($qry))
 		{